Revert "Reverts to track dalvik and libcore"
This reverts commit 53d6ff445706c390c541d10ef11f1b2f19ab14e8.
Change-Id: I7cfff5b532b0dd6ffef010732cd248f58236421b
diff --git a/src/object.h b/src/object.h
index 9b1d3c7..1eee2b8 100644
--- a/src/object.h
+++ b/src/object.h
@@ -569,7 +569,7 @@
DISALLOW_IMPLICIT_CONSTRUCTORS(Field);
};
-// C++ mirror of java.lang.reflect.Method
+// C++ mirror of java.lang.reflect.Method and java.lang.reflect.Constructor
class MANAGED Method : public AccessibleObject {
public:
// An function that invokes a method with an array of its arguments.
@@ -2032,7 +2032,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
@@ -2046,6 +2047,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
@@ -2317,7 +2319,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);