commit 5b783e66b26b7b6ee13d344f4b77f6b7c47c4723
author Hiroshi Yamauchi <yamauchi@google.com> Wed Mar 18 17:20:11 2015 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Thu Mar 19 11:48:24 2015 -0700
tree e1f54fec55617c757813ab11beb9072521427596
parent b63ff273375c488fae2555fad4e5873d3613aa5d

Fix 003-omnibus-opcodes flaky failures with GSS GC.

Fix a moving GC bug in Class::SetStatus().

Bug: 19828874

Change-Id: I6bef49a7ce964e8a7e316f282aaf1b8544efe76d

runtime/mirror/class.h

diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index bd49754..e7f7c6e 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -140,7 +140,9 @@
         GetField32Volatile<kVerifyFlags>(OFFSET_OF_OBJECT_MEMBER(Class, status_)));
   }
 
-  void SetStatus(Status new_status, Thread* self) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+  // This is static because 'this' may be moved by GC.
+  static void SetStatus(Handle<Class> h_this, Status new_status, Thread* self)
+      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
   static MemberOffset StatusOffset() {
     return OFFSET_OF_OBJECT_MEMBER(Class, status_);