commit 6785702b58ac97c07550a67734b9ef88e94d7d99
author Mathieu Chartier <mathieuc@google.com> Thu Nov 27 01:40:55 2014 +0000
committer Mathieu Chartier <mathieuc@google.com> Thu Nov 27 01:40:55 2014 +0000
tree 3084b2f8676852543e24efe4a3a022c3125abcd6
parent 12e29285346a68e46444a5a7b87608475c1147ac

Revert "Revert "Add missing thread state change to kWaitingForCheckPointsToRun""

This reverts commit 12e29285346a68e46444a5a7b87608475c1147ac.

Change-Id: I24e42309f19f781f3159cb715e8a64d6aea4b464

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index e1d1889..8212d44 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -1040,6 +1040,7 @@
     // Trim locals indirect reference tables.
     Barrier barrier(0);
     TrimIndirectReferenceTableClosure closure(&barrier);
+    ScopedThreadStateChange tsc(self, kWaitingForCheckPointsToRun);
     size_t barrier_count = Runtime::Current()->GetThreadList()->RunCheckpoint(&closure);
     barrier.Increment(self, barrier_count);
   }