Mercurial > hg > truffle
diff src/share/vm/classfile/systemDictionary.cpp @ 4137:04b9a2566eec
Merge with hsx23/hotspot.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Sat, 17 Dec 2011 21:40:27 +0100 |
parents | be4ca325525a e6b1331a51d2 |
children | 33df1aeaebbf |
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.cpp Sat Dec 17 20:50:09 2011 +0100 +++ b/src/share/vm/classfile/systemDictionary.cpp Sat Dec 17 21:40:27 2011 +0100 @@ -125,13 +125,13 @@ bool SystemDictionary::is_parallelCapable(Handle class_loader) { if (UnsyncloadClass || class_loader.is_null()) return true; if (AlwaysLockClassLoader) return false; - return java_lang_Class::parallelCapable(class_loader()); + return java_lang_ClassLoader::parallelCapable(class_loader()); } // ---------------------------------------------------------------------------- // ParallelDefineClass flag does not apply to bootclass loader bool SystemDictionary::is_parallelDefine(Handle class_loader) { if (class_loader.is_null()) return false; - if (AllowParallelDefineClass && java_lang_Class::parallelCapable(class_loader())) { + if (AllowParallelDefineClass && java_lang_ClassLoader::parallelCapable(class_loader())) { return true; } return false; @@ -1291,7 +1291,7 @@ Symbol* class_name, TRAPS) { - klassOop dlm = SystemDictionary::sun_jkernel_DownloadManager_klass(); + klassOop dlm = SystemDictionary::DownloadManager_klass(); instanceKlassHandle nk; // If download manager class isn't loaded just return. @@ -1954,7 +1954,7 @@ // first do Object, String, Class initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK); - debug_only(instanceKlass::verify_class_klass_nonstatic_oop_maps(WK_KLASS(Class_klass))); + java_lang_Class::compute_offsets(); // Fixup mirrors for classes loaded before java.lang.Class. // These calls iterate over the objects currently in the perm gen @@ -1979,7 +1979,7 @@ // JSR 292 classes WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass); - WKID jsr292_group_end = WK_KLASS_ENUM_NAME(CallSite_klass); + WKID jsr292_group_end = WK_KLASS_ENUM_NAME(VolatileCallSite_klass); initialize_wk_klasses_until(jsr292_group_start, scan, CHECK); if (EnableInvokeDynamic) { initialize_wk_klasses_through(jsr292_group_end, scan, CHECK); @@ -2002,7 +2002,7 @@ //_box_klasses[T_ARRAY] = WK_KLASS(object_klass); #ifdef KERNEL - if (sun_jkernel_DownloadManager_klass() == NULL) { + if (DownloadManager_klass() == NULL) { warning("Cannot find sun/jkernel/DownloadManager"); } #endif // KERNEL @@ -2738,7 +2738,7 @@ class_size += ik->local_interfaces()->size(); class_size += ik->transitive_interfaces()->size(); // We do not have to count implementors, since we only store one! - class_size += ik->fields()->size(); + class_size += ik->all_fields_count() * FieldInfo::field_slots; } }