commit c6766ed17d27417bfce62c31b342b3faa47ada5d
author Brian Carlstrom <bdc@google.com> Wed Sep 21 11:42:59 2011 -0700
committer Brian Carlstrom <bdc@google.com> Wed Sep 21 11:42:59 2011 -0700
tree d8cb372d2d8c80a95acdc74d0fe62bf3db7db916
parent 27ec961a1da540ba7f16c07a682585ab167317ad

Tracking removal of Method.NO_ANNOTATIONS static field from libcore

Change-Id: Iba14a194e3c9e05af04a3d1cd23b42990d77894e

src/class_linker_test.cc

diff --git a/src/class_linker_test.cc b/src/class_linker_test.cc
index 25fea16..6b4c5c0 100644
--- a/src/class_linker_test.cc
+++ b/src/class_linker_test.cc
@@ -648,7 +648,6 @@
     class_descriptor = "Ljava/lang/reflect/Method;";
 
     // alphabetical references
-    offsets.push_back(CheckOffset(OFFSETOF_MEMBER(MethodClass, NO_ANNOTATIONS_),     "NO_ANNOTATIONS"));
     offsets.push_back(CheckOffset(OFFSETOF_MEMBER(MethodClass, ORDER_BY_SIGNATURE_), "ORDER_BY_SIGNATURE"));
   };
 };

src/object.h

diff --git a/src/object.h b/src/object.h
index eb11be7..e0a13ca 100644
--- a/src/object.h
+++ b/src/object.h
@@ -1988,7 +1988,8 @@
   // access flags; low 16 bits are defined by VM spec
   uint32_t access_flags_;
 
-  // Total class size; used when allocating storage on gc heap.
+  // Total size of the Class instance; used when allocating storage on gc heap.
+  // See also object_size_.
   size_t class_size_;
 
   // tid used to check for recursive <clinit> invocation
@@ -2002,6 +2003,7 @@
 
   // Total object size; used when allocating storage on gc heap.
   // (For interfaces and abstract classes this will be zero.)
+  // See also class_size_.
   size_t object_size_;
 
   // primitive type index, or kPrimNot (0); set for generated prim classes
@@ -2272,7 +2274,6 @@
 
 class MANAGED MethodClass : public Class {
  private:
-  ObjectArray<Object>* NO_ANNOTATIONS_;
   Object* ORDER_BY_SIGNATURE_;
   friend struct MethodClassOffsets;  // for verifying offset information
   DISALLOW_IMPLICIT_CONSTRUCTORS(MethodClass);