commit c712250ce54eb95603f1e09b96a86a3e99ec6827
author Piotr Jastrzebski <haaawk@google.com> Thu May 07 09:41:00 2015 +0100
committer Narayan Kamath <narayan@google.com> Mon Nov 09 10:35:14 2015 +0000
tree d1e8e3bd38f7673214bf640c3c9f16b0882d53ae
parent 63cb74b360141035847c31eccfd4883beef0a001

Update the layout for Class.class.

We now have 3 static integer fields representing bitmasks
for the modifiers (SYNTHETIC, ENUM, ANNOTATION) etc.

Change-Id: Ie26b932c285626c064a3c7f4ae773c8c386005d6

runtime/mirror/class.h

diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index 6c1e93e..d3eb615 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -504,7 +504,7 @@
   static uint32_t ClassClassSize() {
     // The number of vtable entries in java.lang.Class.
     uint32_t vtable_entries = Object::kVTableLength + 69;
-    return ComputeClassSize(true, vtable_entries, 0, 1, 0);
+    return ComputeClassSize(true, vtable_entries, 3, 1, 0);
   }
 
   // The size of a java.lang.Class representing a primitive such as int.class.
@@ -1068,6 +1068,8 @@
 
   void CheckObjectAlloc() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
+  HeapReference<Object> annotation_type_;
+
   // defining class loader, or NULL for the "bootstrap" system loader
   HeapReference<ClassLoader> class_loader_;