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_VMRuntime.cc b/src/native/dalvik_system_VMRuntime.cc
index bf518dc..5ce27fb 100644
--- a/src/native/dalvik_system_VMRuntime.cc
+++ b/src/native/dalvik_system_VMRuntime.cc
@@ -19,7 +19,8 @@
#include "class_linker.h"
#include "debugger.h"
#include "jni_internal.h"
-#include "object.h"
+#include "mirror/object.h"
+#include "mirror/object-inl.h"
#include "object_utils.h"
#include "scoped_thread_state_change.h"
#include "gc/space.h"
@@ -52,7 +53,7 @@
UNIMPLEMENTED(FATAL);
#endif
- Class* element_class = soa.Decode<Class*>(javaElementClass);
+ mirror::Class* element_class = soa.Decode<mirror::Class*>(javaElementClass);
if (element_class == NULL) {
soa.Self()->ThrowNewException("Ljava/lang/NullPointerException;", "element class == null");
return NULL;
@@ -66,8 +67,8 @@
std::string descriptor;
descriptor += "[";
descriptor += ClassHelper(element_class).GetDescriptor();
- Class* array_class = class_linker->FindClass(descriptor.c_str(), NULL);
- Array* result = Array::Alloc(soa.Self(), array_class, length);
+ mirror::Class* array_class = class_linker->FindClass(descriptor.c_str(), NULL);
+ mirror::Array* result = mirror::Array::Alloc(soa.Self(), array_class, length);
if (result == NULL) {
return NULL;
}
@@ -79,7 +80,7 @@
return 0;
}
ScopedObjectAccess soa(env);
- Array* array = soa.Decode<Array*>(javaArray);
+ mirror::Array* array = soa.Decode<mirror::Array*>(javaArray);
if (!array->IsArrayInstance()) {
soa.Self()->ThrowNewException("Ljava/lang/IllegalArgumentException;", "not an array");
return 0;