commit 121b25e246b7012cfd895f205855c6102da48305
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Fri Nov 20 11:24:33 2015 +0000
committer Narayan Kamath <narayan@google.com> Sat Nov 21 16:28:15 2015 +0000
tree 8d7e4dae58b59e9a554db03a06c800f3caf5b6b9
parent 31f7afcd651ca5836892d1c24010933fa40c29e4
parent 13ca74fed068a6a49221b5213ce0b1bebeda3ed6

Merge mnc-dr-enso-dev into goog/master

Bug: 25758743
Change-Id: I19d433934f01856e7b5a7392a58b759c3ac386e7

runtime/mirror/class.h

diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index fcfb4b9..0b2cadc 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -578,8 +578,8 @@
   // The size of java.lang.Class.class.
   static uint32_t ClassClassSize(size_t pointer_size) {
     // The number of vtable entries in java.lang.Class.
-    uint32_t vtable_entries = Object::kVTableLength + 65;
-    return ComputeClassSize(true, vtable_entries, 0, 0, 0, 1, 0, pointer_size);
+    uint32_t vtable_entries = Object::kVTableLength + 69;
+    return ComputeClassSize(true, vtable_entries, 0, 0, 4, 1, 0, pointer_size);
   }
 
   // The size of a java.lang.Class representing a primitive such as int.class.
@@ -1233,6 +1233,8 @@
   void VisitReferences(mirror::Class* klass, const Visitor& visitor)
       SHARED_REQUIRES(Locks::mutator_lock_);
 
+  HeapReference<Object> annotation_type_;
+
   // Defining class loader, or null for the "bootstrap" system loader.
   HeapReference<ClassLoader> class_loader_;
 
@@ -1278,6 +1280,9 @@
   // virtual_ methods_ for miranda methods.
   HeapReference<PointerArray> vtable_;
 
+  // Access flags; low 16 bits are defined by VM spec.
+  uint32_t access_flags_;
+
   // Short cuts to dex_cache_ member for fast compiled code access.
   uint64_t dex_cache_strings_;
 
@@ -1302,9 +1307,6 @@
   // length-prefixed array.
   uint64_t virtual_methods_;
 
-  // Access flags; low 16 bits are defined by VM spec.
-  uint32_t access_flags_;
-
   // Class flags to help speed up visiting object references.
   uint32_t class_flags_;