Reverts to track dalvik and libcore
Revert "Tracking removal of Method.NO_ANNOTATIONS static field from libcore"
This reverts commit c6766ed17d27417bfce62c31b342b3faa47ada5d.
Revert "Implement Class.getDex."
This reverts commit 98fb41647a5664922a196fd1f6b343e6bad8e51e
Revert "Track libcore change."
This revert commit c3d530c371d5c915f4d4545810d77d391dbbfec9
Change-Id: I7159af63f100fc9810e6c2e5ef18b0c4942acc8b
diff --git a/src/object.h b/src/object.h
index 7da6a5d..51b9213 100644
--- a/src/object.h
+++ b/src/object.h
@@ -1989,8 +1989,7 @@
// access flags; low 16 bits are defined by VM spec
uint32_t access_flags_;
- // Total size of the Class instance; used when allocating storage on gc heap.
- // See also object_size_.
+ // Total class size; used when allocating storage on gc heap.
size_t class_size_;
// tid used to check for recursive <clinit> invocation
@@ -2004,7 +2003,6 @@
// 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
@@ -2275,6 +2273,7 @@
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);