Directory restructuring of object.h
Break object.h into constituent files.
Reduce number of #includes in other GC header files.
Introduce -inl.h files to avoid mirror files #include-ing each other.
Check invariants of verifier RegTypes for all constructors.
Change-Id: Iecf1171c02910ac152d52947330ef456df4043bc
diff --git a/src/native/dalvik_system_VMDebug.cc b/src/native/dalvik_system_VMDebug.cc
index e5a398a..dc07a31 100644
--- a/src/native/dalvik_system_VMDebug.cc
+++ b/src/native/dalvik_system_VMDebug.cc
@@ -21,6 +21,7 @@
#include "debugger.h"
#include "hprof/hprof.h"
#include "jni_internal.h"
+#include "mirror/class.h"
#include "ScopedUtfChars.h"
#include "scoped_thread_state_change.h"
#include "toStringArray.h"
@@ -220,11 +221,11 @@
static jlong VMDebug_countInstancesOfClass(JNIEnv* env, jclass, jclass javaClass,
jboolean countAssignable) {
ScopedObjectAccess soa(env);
- Class* c = soa.Decode<Class*>(javaClass);
+ mirror::Class* c = soa.Decode<mirror::Class*>(javaClass);
if (c == NULL) {
return 0;
}
- std::vector<Class*> classes;
+ std::vector<mirror::Class*> classes;
classes.push_back(c);
uint64_t count = 0;
Runtime::Current()->GetHeap()->CountInstances(classes, countAssignable, &count);