--- a/hotspot/src/share/vm/runtime/vmStructs.cpp Fri Oct 23 14:33:19 2015 +0300
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp Mon Oct 26 13:11:36 2015 -0400
@@ -688,42 +688,42 @@
static_field(SystemDictionary, _shared_dictionary, Dictionary*) \
static_field(SystemDictionary, _system_loader_lock_obj, oop) \
static_field(SystemDictionary, _loader_constraints, LoaderConstraintTable*) \
- static_field(SystemDictionary, WK_KLASS(Object_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(String_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(Class_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(Cloneable_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(ClassLoader_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(Serializable_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(System_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(Throwable_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(ThreadDeath_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(Error_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(Exception_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(RuntimeException_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(ClassNotFoundException_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(NoClassDefFoundError_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(LinkageError_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(ClassCastException_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(ArrayStoreException_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(VirtualMachineError_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(OutOfMemoryError_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(StackOverflowError_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(ProtectionDomain_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(AccessControlContext_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(SecureClassLoader_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(Reference_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(SoftReference_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(WeakReference_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(FinalReference_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(PhantomReference_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(Cleaner_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(Finalizer_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(Thread_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(ThreadGroup_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(Properties_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(StringBuffer_klass), Klass*) \
- static_field(SystemDictionary, WK_KLASS(MethodHandle_klass), Klass*) \
- static_field(SystemDictionary, _box_klasses[0], Klass*) \
+ static_field(SystemDictionary, WK_KLASS(Object_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(String_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(Class_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(Cloneable_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(ClassLoader_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(Serializable_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(System_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(Throwable_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(ThreadDeath_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(Error_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(Exception_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(RuntimeException_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(ClassNotFoundException_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(NoClassDefFoundError_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(LinkageError_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(ClassCastException_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(ArrayStoreException_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(VirtualMachineError_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(OutOfMemoryError_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(StackOverflowError_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(ProtectionDomain_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(AccessControlContext_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(SecureClassLoader_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(Reference_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(SoftReference_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(WeakReference_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(FinalReference_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(PhantomReference_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(Cleaner_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(Finalizer_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(Thread_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(ThreadGroup_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(Properties_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(StringBuffer_klass), InstanceKlass*) \
+ static_field(SystemDictionary, WK_KLASS(MethodHandle_klass), InstanceKlass*) \
+ static_field(SystemDictionary, _box_klasses[0], InstanceKlass*) \
static_field(SystemDictionary, _java_system_loader, oop) \
\
/*************/ \