Adjustments for changes made to java.lang.Class
Fix up the runtime after removal of the annotationType field
from java.lang.Class.
Test: make test-art-host / boot a device
Change-Id: I5f37567d2b5ec381b35e66fef29287abe307b840
diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index 8f6ce44..978fc4c 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -568,7 +568,7 @@
// The size of java.lang.Class.class.
static uint32_t ClassClassSize(PointerSize pointer_size) {
// The number of vtable entries in java.lang.Class.
- uint32_t vtable_entries = Object::kVTableLength + 72;
+ uint32_t vtable_entries = Object::kVTableLength + 70;
return ComputeClassSize(true, vtable_entries, 0, 0, 4, 1, 0, pointer_size);
}
@@ -1343,8 +1343,6 @@
// 'Class' Object Fields
// Order governed by java field ordering. See art::ClassLinker::LinkFields.
- HeapReference<Object> annotation_type_;
-
// Defining class loader, or null for the "bootstrap" system loader.
HeapReference<ClassLoader> class_loader_;
@@ -1390,9 +1388,6 @@
// virtual_ methods_ for miranda methods.
HeapReference<PointerArray> vtable_;
- // Access flags; low 16 bits are defined by VM spec.
- uint32_t access_flags_;
-
// Short cuts to dex_cache_ member for fast compiled code access.
uint64_t dex_cache_strings_;
@@ -1427,6 +1422,9 @@
// Static fields length-prefixed array.
uint64_t sfields_;
+ // Access flags; low 16 bits are defined by VM spec.
+ uint32_t access_flags_;
+
// Class flags to help speed up visiting object references.
uint32_t class_flags_;