commit f517f1a994fab72ba484bbbac6911e315f59f6cd
author Mathieu Chartier <mathieuc@google.com> Thu Mar 06 15:52:27 2014 -0800
committer Mathieu Chartier <mathieuc@google.com> Thu Mar 06 16:00:46 2014 -0800
tree 5dbd368323e6d3ebdf47db4ab7d5bdd7a2a7845f
parent c7a8981098646b4e255d9ede1f3798023bac6e84

Restore obj after RequestConcurrentGC.

RequestConcurrentGC can cause thread suspension, this means that
another thread could transition the heap or cause moving GC.

Bug: 12934910

Change-Id: I5c07161e2e849d7acbdf939f1c24e1ba361a1d6a

runtime/gc/heap.h

diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h
index a90af27..92da7e9 100644
--- a/runtime/gc/heap.h
+++ b/runtime/gc/heap.h
@@ -575,7 +575,8 @@
   bool ShouldAllocLargeObject(mirror::Class* c, size_t byte_count) const
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
   ALWAYS_INLINE void CheckConcurrentGC(Thread* self, size_t new_num_bytes_allocated,
-                                       mirror::Object* obj);
+                                       mirror::Object** obj)
+      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
   // We don't force this to be inlined since it is a slow path.
   template <bool kInstrumented, typename PreFenceVisitor>