Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
6914300: ciEnv should export all well known classes
Wed, 06 Jan 2010 14:22:39 -0800
- author
- never
- date
- Wed, 06 Jan 2010 14:22:39 -0800
- changeset 1577
- 4ce7240d622c
- parent 1575
- 1f6d42899c3a
- child 1578
- aad340e07bc4
6914300: ciEnv should export all well known classes
Reviewed-by: kvn, twisti
1.1 --- a/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java Tue Jan 05 11:16:09 2010 -0800 1.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java Wed Jan 06 14:22:39 2010 -0800 1.3 @@ -63,12 +63,12 @@ 1.4 javaSystemLoaderField = type.getOopField("_java_system_loader"); 1.5 nofBuckets = db.lookupIntConstant("SystemDictionary::_nof_buckets").intValue(); 1.6 1.7 - objectKlassField = type.getOopField(WK_KLASS("object_klass")); 1.8 - classLoaderKlassField = type.getOopField(WK_KLASS("classloader_klass")); 1.9 - stringKlassField = type.getOopField(WK_KLASS("string_klass")); 1.10 - systemKlassField = type.getOopField(WK_KLASS("system_klass")); 1.11 - threadKlassField = type.getOopField(WK_KLASS("thread_klass")); 1.12 - threadGroupKlassField = type.getOopField(WK_KLASS("threadGroup_klass")); 1.13 + objectKlassField = type.getOopField(WK_KLASS("Object_klass")); 1.14 + classLoaderKlassField = type.getOopField(WK_KLASS("ClassLoader_klass")); 1.15 + stringKlassField = type.getOopField(WK_KLASS("String_klass")); 1.16 + systemKlassField = type.getOopField(WK_KLASS("System_klass")); 1.17 + threadKlassField = type.getOopField(WK_KLASS("Thread_klass")); 1.18 + threadGroupKlassField = type.getOopField(WK_KLASS("ThreadGroup_klass")); 1.19 } 1.20 1.21 // This WK functions must follow the definitions in systemDictionary.hpp:
2.1 --- a/src/share/vm/c1/c1_Runtime1.cpp Tue Jan 05 11:16:09 2010 -0800 2.2 +++ b/src/share/vm/c1/c1_Runtime1.cpp Wed Jan 06 14:22:39 2010 -0800 2.3 @@ -425,7 +425,7 @@ 2.4 assert(exception.not_null(), "NULL exceptions should be handled by throw_exception"); 2.5 assert(exception->is_oop(), "just checking"); 2.6 // Check that exception is a subclass of Throwable, otherwise we have a VerifyError 2.7 - if (!(exception->is_a(SystemDictionary::throwable_klass()))) { 2.8 + if (!(exception->is_a(SystemDictionary::Throwable_klass()))) { 2.9 if (ExitVMOnVerifyError) vm_exit(-1); 2.10 ShouldNotReachHere(); 2.11 }
3.1 --- a/src/share/vm/ci/ciEnv.cpp Tue Jan 05 11:16:09 2010 -0800 3.2 +++ b/src/share/vm/ci/ciEnv.cpp Wed Jan 06 14:22:39 2010 -0800 3.3 @@ -38,18 +38,9 @@ 3.4 ciTypeArrayKlassKlass* ciEnv::_type_array_klass_klass_instance; 3.5 ciObjArrayKlassKlass* ciEnv::_obj_array_klass_klass_instance; 3.6 3.7 -ciInstanceKlass* ciEnv::_ArrayStoreException; 3.8 -ciInstanceKlass* ciEnv::_Class; 3.9 -ciInstanceKlass* ciEnv::_ClassCastException; 3.10 -ciInstanceKlass* ciEnv::_InvokeDynamic; 3.11 -ciInstanceKlass* ciEnv::_Object; 3.12 -ciInstanceKlass* ciEnv::_Throwable; 3.13 -ciInstanceKlass* ciEnv::_Thread; 3.14 -ciInstanceKlass* ciEnv::_OutOfMemoryError; 3.15 -ciInstanceKlass* ciEnv::_String; 3.16 -ciInstanceKlass* ciEnv::_StringBuffer; 3.17 -ciInstanceKlass* ciEnv::_StringBuilder; 3.18 -ciInstanceKlass* ciEnv::_Integer; 3.19 +#define WK_KLASS_DEFN(name, ignore_s, ignore_o) ciInstanceKlass* ciEnv::_##name = NULL; 3.20 +WK_KLASSES_DO(WK_KLASS_DEFN) 3.21 +#undef WK_KLASS_DEFN 3.22 3.23 ciSymbol* ciEnv::_unloaded_cisymbol = NULL; 3.24 ciInstanceKlass* ciEnv::_unloaded_ciinstance_klass = NULL;
4.1 --- a/src/share/vm/ci/ciEnv.hpp Tue Jan 05 11:16:09 2010 -0800 4.2 +++ b/src/share/vm/ci/ciEnv.hpp Wed Jan 06 14:22:39 2010 -0800 4.3 @@ -74,18 +74,9 @@ 4.4 static ciTypeArrayKlassKlass* _type_array_klass_klass_instance; 4.5 static ciObjArrayKlassKlass* _obj_array_klass_klass_instance; 4.6 4.7 - static ciInstanceKlass* _ArrayStoreException; 4.8 - static ciInstanceKlass* _Class; 4.9 - static ciInstanceKlass* _ClassCastException; 4.10 - static ciInstanceKlass* _InvokeDynamic; 4.11 - static ciInstanceKlass* _Object; 4.12 - static ciInstanceKlass* _Throwable; 4.13 - static ciInstanceKlass* _Thread; 4.14 - static ciInstanceKlass* _OutOfMemoryError; 4.15 - static ciInstanceKlass* _String; 4.16 - static ciInstanceKlass* _StringBuffer; 4.17 - static ciInstanceKlass* _StringBuilder; 4.18 - static ciInstanceKlass* _Integer; 4.19 +#define WK_KLASS_DECL(name, ignore_s, ignore_o) static ciInstanceKlass* _##name; 4.20 + WK_KLASSES_DO(WK_KLASS_DECL) 4.21 +#undef WK_KLASS_DECL 4.22 4.23 static ciSymbol* _unloaded_cisymbol; 4.24 static ciInstanceKlass* _unloaded_ciinstance_klass; 4.25 @@ -301,42 +292,13 @@ 4.26 4.27 4.28 // Access to certain well known ciObjects. 4.29 - ciInstanceKlass* ArrayStoreException_klass() { 4.30 - return _ArrayStoreException; 4.31 +#define WK_KLASS_FUNC(name, ignore_s, ignore_o) \ 4.32 + ciInstanceKlass* name() { \ 4.33 + return _##name;\ 4.34 } 4.35 - ciInstanceKlass* Class_klass() { 4.36 - return _Class; 4.37 - } 4.38 - ciInstanceKlass* ClassCastException_klass() { 4.39 - return _ClassCastException; 4.40 - } 4.41 - ciInstanceKlass* InvokeDynamic_klass() { 4.42 - return _InvokeDynamic; 4.43 - } 4.44 - ciInstanceKlass* Object_klass() { 4.45 - return _Object; 4.46 - } 4.47 - ciInstanceKlass* Throwable_klass() { 4.48 - return _Throwable; 4.49 - } 4.50 - ciInstanceKlass* Thread_klass() { 4.51 - return _Thread; 4.52 - } 4.53 - ciInstanceKlass* OutOfMemoryError_klass() { 4.54 - return _OutOfMemoryError; 4.55 - } 4.56 - ciInstanceKlass* String_klass() { 4.57 - return _String; 4.58 - } 4.59 - ciInstanceKlass* StringBuilder_klass() { 4.60 - return _StringBuilder; 4.61 - } 4.62 - ciInstanceKlass* StringBuffer_klass() { 4.63 - return _StringBuffer; 4.64 - } 4.65 - ciInstanceKlass* Integer_klass() { 4.66 - return _Integer; 4.67 - } 4.68 + WK_KLASSES_DO(WK_KLASS_FUNC) 4.69 +#undef WK_KLASS_FUNC 4.70 + 4.71 ciInstance* NullPointerException_instance() { 4.72 assert(_NullPointerException_instance != NULL, "initialization problem"); 4.73 return _NullPointerException_instance;
5.1 --- a/src/share/vm/ci/ciField.cpp Tue Jan 05 11:16:09 2010 -0800 5.2 +++ b/src/share/vm/ci/ciField.cpp Wed Jan 06 14:22:39 2010 -0800 5.3 @@ -192,8 +192,8 @@ 5.4 // java.lang.System.out, and java.lang.System.err. 5.5 5.6 klassOop k = _holder->get_klassOop(); 5.7 - assert( SystemDictionary::system_klass() != NULL, "Check once per vm"); 5.8 - if( k == SystemDictionary::system_klass() ) { 5.9 + assert( SystemDictionary::System_klass() != NULL, "Check once per vm"); 5.10 + if( k == SystemDictionary::System_klass() ) { 5.11 // Check offsets for case 2: System.in, System.out, or System.err 5.12 if( _offset == java_lang_System::in_offset_in_bytes() || 5.13 _offset == java_lang_System::out_offset_in_bytes() ||
6.1 --- a/src/share/vm/ci/ciInstance.cpp Tue Jan 05 11:16:09 2010 -0800 6.2 +++ b/src/share/vm/ci/ciInstance.cpp Wed Jan 06 14:22:39 2010 -0800 6.3 @@ -36,7 +36,7 @@ 6.4 VM_ENTRY_MARK; 6.5 oop m = get_oop(); 6.6 // Return NULL if it is not java.lang.Class. 6.7 - if (m == NULL || m->klass() != SystemDictionary::class_klass()) { 6.8 + if (m == NULL || m->klass() != SystemDictionary::Class_klass()) { 6.9 return NULL; 6.10 } 6.11 // Return either a primitive type or a klass.
7.1 --- a/src/share/vm/ci/ciInstanceKlass.cpp Tue Jan 05 11:16:09 2010 -0800 7.2 +++ b/src/share/vm/ci/ciInstanceKlass.cpp Wed Jan 06 14:22:39 2010 -0800 7.3 @@ -75,7 +75,7 @@ 7.4 _java_mirror = NULL; 7.5 7.6 if (is_shared()) { 7.7 - if (h_k() != SystemDictionary::object_klass()) { 7.8 + if (h_k() != SystemDictionary::Object_klass()) { 7.9 super(); 7.10 } 7.11 java_mirror();
8.1 --- a/src/share/vm/ci/ciObjectFactory.cpp Tue Jan 05 11:16:09 2010 -0800 8.2 +++ b/src/share/vm/ci/ciObjectFactory.cpp Wed Jan 06 14:22:39 2010 -0800 8.3 @@ -144,43 +144,13 @@ 8.4 ciEnv::_obj_array_klass_klass_instance = 8.5 get(Universe::objArrayKlassKlassObj()) 8.6 ->as_obj_array_klass_klass(); 8.7 - ciEnv::_ArrayStoreException = 8.8 - get(SystemDictionary::ArrayStoreException_klass()) 8.9 - ->as_instance_klass(); 8.10 - ciEnv::_Class = 8.11 - get(SystemDictionary::class_klass()) 8.12 - ->as_instance_klass(); 8.13 - ciEnv::_ClassCastException = 8.14 - get(SystemDictionary::ClassCastException_klass()) 8.15 - ->as_instance_klass(); 8.16 - if (EnableInvokeDynamic) { 8.17 - ciEnv::_InvokeDynamic = 8.18 - get(SystemDictionary::InvokeDynamic_klass())->as_instance_klass(); 8.19 - } 8.20 - ciEnv::_Object = 8.21 - get(SystemDictionary::object_klass()) 8.22 - ->as_instance_klass(); 8.23 - ciEnv::_Throwable = 8.24 - get(SystemDictionary::throwable_klass()) 8.25 - ->as_instance_klass(); 8.26 - ciEnv::_Thread = 8.27 - get(SystemDictionary::thread_klass()) 8.28 - ->as_instance_klass(); 8.29 - ciEnv::_OutOfMemoryError = 8.30 - get(SystemDictionary::OutOfMemoryError_klass()) 8.31 - ->as_instance_klass(); 8.32 - ciEnv::_String = 8.33 - get(SystemDictionary::string_klass()) 8.34 - ->as_instance_klass(); 8.35 - ciEnv::_StringBuffer = 8.36 - get(SystemDictionary::stringBuffer_klass()) 8.37 - ->as_instance_klass(); 8.38 - ciEnv::_StringBuilder = 8.39 - get(SystemDictionary::StringBuilder_klass()) 8.40 - ->as_instance_klass(); 8.41 - ciEnv::_Integer = 8.42 - get(SystemDictionary::int_klass()) 8.43 - ->as_instance_klass(); 8.44 + 8.45 +#define WK_KLASS_DEFN(name, ignore_s, opt) \ 8.46 + if (SystemDictionary::name() != NULL) \ 8.47 + ciEnv::_##name = get(SystemDictionary::name())->as_instance_klass(); 8.48 + 8.49 + WK_KLASSES_DO(WK_KLASS_DEFN) 8.50 +#undef WK_KLASS_DEFN 8.51 8.52 for (int len = -1; len != _ci_objects->length(); ) { 8.53 len = _ci_objects->length(); 8.54 @@ -588,7 +558,7 @@ 8.55 if (key->is_perm() && _non_perm_count == 0) { 8.56 return emptyBucket; 8.57 } else if (key->is_instance()) { 8.58 - if (key->klass() == SystemDictionary::class_klass()) { 8.59 + if (key->klass() == SystemDictionary::Class_klass()) { 8.60 // class mirror instances are always perm 8.61 return emptyBucket; 8.62 }
9.1 --- a/src/share/vm/ci/ciType.cpp Tue Jan 05 11:16:09 2010 -0800 9.2 +++ b/src/share/vm/ci/ciType.cpp Wed Jan 06 14:22:39 2010 -0800 9.3 @@ -111,7 +111,7 @@ 9.4 // short, etc. 9.5 // Note: Bare T_ADDRESS means a raw pointer type, not a return_address. 9.6 assert((uint)t < T_CONFLICT+1, "range check"); 9.7 - if (t == T_OBJECT) return ciEnv::_Object; // java/lang/Object 9.8 + if (t == T_OBJECT) return ciEnv::_Object_klass; // java/lang/Object 9.9 assert(_basic_types[t] != NULL, "domain check"); 9.10 return _basic_types[t]; 9.11 }
10.1 --- a/src/share/vm/ci/ciUtilities.hpp Tue Jan 05 11:16:09 2010 -0800 10.2 +++ b/src/share/vm/ci/ciUtilities.hpp Wed Jan 06 14:22:39 2010 -0800 10.3 @@ -79,7 +79,7 @@ 10.4 THREAD); \ 10.5 if (HAS_PENDING_EXCEPTION) { \ 10.6 if (PENDING_EXCEPTION->klass() == \ 10.7 - SystemDictionary::threaddeath_klass()) { \ 10.8 + SystemDictionary::ThreadDeath_klass()) { \ 10.9 /* Kill the compilation. */ \ 10.10 fatal("unhandled ci exception"); \ 10.11 return (result); \
11.1 --- a/src/share/vm/classfile/classFileParser.cpp Tue Jan 05 11:16:09 2010 -0800 11.2 +++ b/src/share/vm/classfile/classFileParser.cpp Wed Jan 06 14:22:39 2010 -0800 11.3 @@ -430,7 +430,7 @@ 11.4 case JVM_CONSTANT_UnresolvedClass : 11.5 // Patching a class means pre-resolving it. 11.6 // The name in the constant pool is ignored. 11.7 - if (patch->klass() == SystemDictionary::class_klass()) { // %%% java_lang_Class::is_instance 11.8 + if (patch->klass() == SystemDictionary::Class_klass()) { // %%% java_lang_Class::is_instance 11.9 guarantee_property(!java_lang_Class::is_primitive(patch()), 11.10 "Illegal class patch at %d in class file %s", 11.11 index, CHECK); 11.12 @@ -3469,8 +3469,8 @@ 11.13 #endif 11.14 11.15 // Check if this klass supports the java.lang.Cloneable interface 11.16 - if (SystemDictionary::cloneable_klass_loaded()) { 11.17 - if (k->is_subtype_of(SystemDictionary::cloneable_klass())) { 11.18 + if (SystemDictionary::Cloneable_klass_loaded()) { 11.19 + if (k->is_subtype_of(SystemDictionary::Cloneable_klass())) { 11.20 k->set_is_cloneable(); 11.21 } 11.22 } 11.23 @@ -4175,7 +4175,7 @@ 11.24 // Check if ch is Java identifier start or is Java identifier part 11.25 // 4672820: call java.lang.Character methods directly without generating separate tables. 11.26 EXCEPTION_MARK; 11.27 - instanceKlassHandle klass (THREAD, SystemDictionary::char_klass()); 11.28 + instanceKlassHandle klass (THREAD, SystemDictionary::Character_klass()); 11.29 11.30 // return value 11.31 JavaValue result(T_BOOLEAN);
12.1 --- a/src/share/vm/classfile/classLoader.cpp Tue Jan 05 11:16:09 2010 -0800 12.2 +++ b/src/share/vm/classfile/classLoader.cpp Wed Jan 06 14:22:39 2010 -0800 12.3 @@ -819,7 +819,7 @@ 12.4 _package_hash_table->copy_pkgnames(packages); 12.5 } 12.6 // Allocate objArray and fill with java.lang.String 12.7 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(), 12.8 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(), 12.9 nof_entries, CHECK_0); 12.10 objArrayHandle result(THREAD, r); 12.11 for (int i = 0; i < nof_entries; i++) {
13.1 --- a/src/share/vm/classfile/javaAssertions.cpp Tue Jan 05 11:16:09 2010 -0800 13.2 +++ b/src/share/vm/classfile/javaAssertions.cpp Wed Jan 06 14:22:39 2010 -0800 13.3 @@ -95,14 +95,14 @@ 13.4 int len; 13.5 typeArrayOop t; 13.6 len = OptionList::count(_packages); 13.7 - objArrayOop pn = oopFactory::new_objArray(SystemDictionary::string_klass(), len, CHECK_NULL); 13.8 + objArrayOop pn = oopFactory::new_objArray(SystemDictionary::String_klass(), len, CHECK_NULL); 13.9 objArrayHandle pkgNames (THREAD, pn); 13.10 t = oopFactory::new_typeArray(T_BOOLEAN, len, CHECK_NULL); 13.11 typeArrayHandle pkgEnabled(THREAD, t); 13.12 fillJavaArrays(_packages, len, pkgNames, pkgEnabled, CHECK_NULL); 13.13 13.14 len = OptionList::count(_classes); 13.15 - objArrayOop cn = oopFactory::new_objArray(SystemDictionary::string_klass(), len, CHECK_NULL); 13.16 + objArrayOop cn = oopFactory::new_objArray(SystemDictionary::String_klass(), len, CHECK_NULL); 13.17 objArrayHandle classNames (THREAD, cn); 13.18 t = oopFactory::new_typeArray(T_BOOLEAN, len, CHECK_NULL); 13.19 typeArrayHandle classEnabled(THREAD, t);
14.1 --- a/src/share/vm/classfile/javaClasses.cpp Tue Jan 05 11:16:09 2010 -0800 14.2 +++ b/src/share/vm/classfile/javaClasses.cpp Wed Jan 06 14:22:39 2010 -0800 14.3 @@ -68,9 +68,9 @@ 14.4 // and the char array it points to end up in the same cache line. 14.5 oop obj; 14.6 if (tenured) { 14.7 - obj = instanceKlass::cast(SystemDictionary::string_klass())->allocate_permanent_instance(CHECK_NH); 14.8 + obj = instanceKlass::cast(SystemDictionary::String_klass())->allocate_permanent_instance(CHECK_NH); 14.9 } else { 14.10 - obj = instanceKlass::cast(SystemDictionary::string_klass())->allocate_instance(CHECK_NH); 14.11 + obj = instanceKlass::cast(SystemDictionary::String_klass())->allocate_instance(CHECK_NH); 14.12 } 14.13 14.14 // Create the char array. The String object must be handlized here 14.15 @@ -293,7 +293,7 @@ 14.16 14.17 bool java_lang_String::equals(oop java_string, jchar* chars, int len) { 14.18 assert(SharedSkipVerify || 14.19 - java_string->klass() == SystemDictionary::string_klass(), 14.20 + java_string->klass() == SystemDictionary::String_klass(), 14.21 "must be java_string"); 14.22 typeArrayOop value = java_lang_String::value(java_string); 14.23 int offset = java_lang_String::offset(java_string); 14.24 @@ -311,7 +311,7 @@ 14.25 14.26 void java_lang_String::print(Handle java_string, outputStream* st) { 14.27 oop obj = java_string(); 14.28 - assert(obj->klass() == SystemDictionary::string_klass(), "must be java_string"); 14.29 + assert(obj->klass() == SystemDictionary::String_klass(), "must be java_string"); 14.30 typeArrayOop value = java_lang_String::value(obj); 14.31 int offset = java_lang_String::offset(obj); 14.32 int length = java_lang_String::length(obj); 14.33 @@ -339,9 +339,9 @@ 14.34 // class is put into the system dictionary. 14.35 int computed_modifiers = k->compute_modifier_flags(CHECK_0); 14.36 k->set_modifier_flags(computed_modifiers); 14.37 - if (SystemDictionary::class_klass_loaded()) { 14.38 + if (SystemDictionary::Class_klass_loaded()) { 14.39 // Allocate mirror (java.lang.Class instance) 14.40 - Handle mirror = instanceKlass::cast(SystemDictionary::class_klass())->allocate_permanent_instance(CHECK_0); 14.41 + Handle mirror = instanceKlass::cast(SystemDictionary::Class_klass())->allocate_permanent_instance(CHECK_0); 14.42 // Setup indirections 14.43 mirror->obj_field_put(klass_offset, k()); 14.44 k->set_java_mirror(mirror()); 14.45 @@ -378,7 +378,7 @@ 14.46 oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS) { 14.47 // This should be improved by adding a field at the Java level or by 14.48 // introducing a new VM klass (see comment in ClassFileParser) 14.49 - oop java_class = instanceKlass::cast(SystemDictionary::class_klass())->allocate_permanent_instance(CHECK_0); 14.50 + oop java_class = instanceKlass::cast(SystemDictionary::Class_klass())->allocate_permanent_instance(CHECK_0); 14.51 if (type != T_VOID) { 14.52 klassOop aklass = Universe::typeArrayKlassObj(type); 14.53 assert(aklass != NULL, "correct bootstrap"); 14.54 @@ -502,7 +502,7 @@ 14.55 14.56 oop java_lang_Class::primitive_mirror(BasicType t) { 14.57 oop mirror = Universe::java_mirror(t); 14.58 - assert(mirror != NULL && mirror->is_a(SystemDictionary::class_klass()), "must be a Class"); 14.59 + assert(mirror != NULL && mirror->is_a(SystemDictionary::Class_klass()), "must be a Class"); 14.60 assert(java_lang_Class::is_primitive(mirror), "must be primitive"); 14.61 return mirror; 14.62 } 14.63 @@ -515,14 +515,14 @@ 14.64 assert(!offsets_computed, "offsets should be initialized only once"); 14.65 offsets_computed = true; 14.66 14.67 - klassOop k = SystemDictionary::class_klass(); 14.68 + klassOop k = SystemDictionary::Class_klass(); 14.69 // The classRedefinedCount field is only present starting in 1.5, 14.70 // so don't go fatal. 14.71 compute_optional_offset(classRedefinedCount_offset, 14.72 k, vmSymbols::classRedefinedCount_name(), vmSymbols::int_signature()); 14.73 14.74 // The field indicating parallelCapable (parallelLockMap) is only present starting in 7, 14.75 - klassOop k1 = SystemDictionary::classloader_klass(); 14.76 + klassOop k1 = SystemDictionary::ClassLoader_klass(); 14.77 compute_optional_offset(parallelCapable_offset, 14.78 k1, vmSymbols::parallelCapable_name(), vmSymbols::concurrenthashmap_signature()); 14.79 } 14.80 @@ -588,7 +588,7 @@ 14.81 void java_lang_Thread::compute_offsets() { 14.82 assert(_group_offset == 0, "offsets should be initialized only once"); 14.83 14.84 - klassOop k = SystemDictionary::thread_klass(); 14.85 + klassOop k = SystemDictionary::Thread_klass(); 14.86 compute_offset(_name_offset, k, vmSymbols::name_name(), vmSymbols::char_array_signature()); 14.87 compute_offset(_group_offset, k, vmSymbols::group_name(), vmSymbols::threadgroup_signature()); 14.88 compute_offset(_contextClassLoader_offset, k, vmSymbols::contextClassLoader_name(), vmSymbols::classloader_signature()); 14.89 @@ -847,7 +847,7 @@ 14.90 void java_lang_ThreadGroup::compute_offsets() { 14.91 assert(_parent_offset == 0, "offsets should be initialized only once"); 14.92 14.93 - klassOop k = SystemDictionary::threadGroup_klass(); 14.94 + klassOop k = SystemDictionary::ThreadGroup_klass(); 14.95 14.96 compute_offset(_parent_offset, k, vmSymbols::parent_name(), vmSymbols::threadgroup_signature()); 14.97 compute_offset(_name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature()); 14.98 @@ -1344,7 +1344,7 @@ 14.99 // No-op if stack trace is disabled 14.100 if (!StackTraceInThrowable) return; 14.101 14.102 - assert(throwable->is_a(SystemDictionary::throwable_klass()), "sanity check"); 14.103 + assert(throwable->is_a(SystemDictionary::Throwable_klass()), "sanity check"); 14.104 14.105 oop backtrace = java_lang_Throwable::backtrace(throwable()); 14.106 assert(backtrace != NULL, "backtrace not preallocated"); 14.107 @@ -1449,7 +1449,7 @@ 14.108 assert(JDK_Version::is_gte_jdk14x_version(), "should only be called in >= 1.4"); 14.109 14.110 // Allocate java.lang.StackTraceElement instance 14.111 - klassOop k = SystemDictionary::stackTraceElement_klass(); 14.112 + klassOop k = SystemDictionary::StackTraceElement_klass(); 14.113 assert(k != NULL, "must be loaded in 1.4+"); 14.114 instanceKlassHandle ik (THREAD, k); 14.115 if (ik->should_be_initialized()) { 14.116 @@ -1487,7 +1487,7 @@ 14.117 14.118 14.119 void java_lang_reflect_AccessibleObject::compute_offsets() { 14.120 - klassOop k = SystemDictionary::reflect_accessible_object_klass(); 14.121 + klassOop k = SystemDictionary::reflect_AccessibleObject_klass(); 14.122 compute_offset(override_offset, k, vmSymbols::override_name(), vmSymbols::bool_signature()); 14.123 } 14.124 14.125 @@ -1502,7 +1502,7 @@ 14.126 } 14.127 14.128 void java_lang_reflect_Method::compute_offsets() { 14.129 - klassOop k = SystemDictionary::reflect_method_klass(); 14.130 + klassOop k = SystemDictionary::reflect_Method_klass(); 14.131 compute_offset(clazz_offset, k, vmSymbols::clazz_name(), vmSymbols::class_signature()); 14.132 compute_offset(name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature()); 14.133 compute_offset(returnType_offset, k, vmSymbols::returnType_name(), vmSymbols::class_signature()); 14.134 @@ -1523,7 +1523,7 @@ 14.135 14.136 Handle java_lang_reflect_Method::create(TRAPS) { 14.137 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); 14.138 - klassOop klass = SystemDictionary::reflect_method_klass(); 14.139 + klassOop klass = SystemDictionary::reflect_Method_klass(); 14.140 // This class is eagerly initialized during VM initialization, since we keep a refence 14.141 // to one of the methods 14.142 assert(instanceKlass::cast(klass)->is_initialized(), "must be initialized"); 14.143 @@ -1665,7 +1665,7 @@ 14.144 } 14.145 14.146 void java_lang_reflect_Constructor::compute_offsets() { 14.147 - klassOop k = SystemDictionary::reflect_constructor_klass(); 14.148 + klassOop k = SystemDictionary::reflect_Constructor_klass(); 14.149 compute_offset(clazz_offset, k, vmSymbols::clazz_name(), vmSymbols::class_signature()); 14.150 compute_offset(parameterTypes_offset, k, vmSymbols::parameterTypes_name(), vmSymbols::class_array_signature()); 14.151 compute_offset(exceptionTypes_offset, k, vmSymbols::exceptionTypes_name(), vmSymbols::class_array_signature()); 14.152 @@ -1789,7 +1789,7 @@ 14.153 } 14.154 14.155 void java_lang_reflect_Field::compute_offsets() { 14.156 - klassOop k = SystemDictionary::reflect_field_klass(); 14.157 + klassOop k = SystemDictionary::reflect_Field_klass(); 14.158 compute_offset(clazz_offset, k, vmSymbols::clazz_name(), vmSymbols::class_signature()); 14.159 compute_offset(name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature()); 14.160 compute_offset(type_offset, k, vmSymbols::type_name(), vmSymbols::class_signature()); 14.161 @@ -1896,7 +1896,7 @@ 14.162 14.163 14.164 void sun_reflect_ConstantPool::compute_offsets() { 14.165 - klassOop k = SystemDictionary::reflect_constant_pool_klass(); 14.166 + klassOop k = SystemDictionary::reflect_ConstantPool_klass(); 14.167 // This null test can be removed post beta 14.168 if (k != NULL) { 14.169 compute_offset(_cp_oop_offset, k, vmSymbols::constantPoolOop_name(), vmSymbols::object_signature()); 14.170 @@ -1906,7 +1906,7 @@ 14.171 14.172 Handle sun_reflect_ConstantPool::create(TRAPS) { 14.173 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); 14.174 - klassOop k = SystemDictionary::reflect_constant_pool_klass(); 14.175 + klassOop k = SystemDictionary::reflect_ConstantPool_klass(); 14.176 instanceKlassHandle klass (THREAD, k); 14.177 // Ensure it is initialized 14.178 klass->initialize(CHECK_NH); 14.179 @@ -1926,7 +1926,7 @@ 14.180 } 14.181 14.182 void sun_reflect_UnsafeStaticFieldAccessorImpl::compute_offsets() { 14.183 - klassOop k = SystemDictionary::reflect_unsafe_static_field_accessor_impl_klass(); 14.184 + klassOop k = SystemDictionary::reflect_UnsafeStaticFieldAccessorImpl_klass(); 14.185 // This null test can be removed post beta 14.186 if (k != NULL) { 14.187 compute_offset(_base_offset, k, 14.188 @@ -2072,7 +2072,7 @@ 14.189 14.190 // Support for java_lang_ref_Reference 14.191 oop java_lang_ref_Reference::pending_list_lock() { 14.192 - instanceKlass* ik = instanceKlass::cast(SystemDictionary::reference_klass()); 14.193 + instanceKlass* ik = instanceKlass::cast(SystemDictionary::Reference_klass()); 14.194 char *addr = (((char *)ik->start_of_static_fields()) + static_lock_offset); 14.195 if (UseCompressedOops) { 14.196 return oopDesc::load_decode_heap_oop((narrowOop *)addr); 14.197 @@ -2082,7 +2082,7 @@ 14.198 } 14.199 14.200 HeapWord *java_lang_ref_Reference::pending_list_addr() { 14.201 - instanceKlass* ik = instanceKlass::cast(SystemDictionary::reference_klass()); 14.202 + instanceKlass* ik = instanceKlass::cast(SystemDictionary::Reference_klass()); 14.203 char *addr = (((char *)ik->start_of_static_fields()) + static_pending_offset); 14.204 // XXX This might not be HeapWord aligned, almost rather be char *. 14.205 return (HeapWord*)addr; 14.206 @@ -2105,17 +2105,17 @@ 14.207 } 14.208 14.209 jlong java_lang_ref_SoftReference::clock() { 14.210 - instanceKlass* ik = instanceKlass::cast(SystemDictionary::soft_reference_klass()); 14.211 + instanceKlass* ik = instanceKlass::cast(SystemDictionary::SoftReference_klass()); 14.212 int offset = ik->offset_of_static_fields() + static_clock_offset; 14.213 14.214 - return SystemDictionary::soft_reference_klass()->long_field(offset); 14.215 + return SystemDictionary::SoftReference_klass()->long_field(offset); 14.216 } 14.217 14.218 void java_lang_ref_SoftReference::set_clock(jlong value) { 14.219 - instanceKlass* ik = instanceKlass::cast(SystemDictionary::soft_reference_klass()); 14.220 + instanceKlass* ik = instanceKlass::cast(SystemDictionary::SoftReference_klass()); 14.221 int offset = ik->offset_of_static_fields() + static_clock_offset; 14.222 14.223 - SystemDictionary::soft_reference_klass()->long_field_put(offset, value); 14.224 + SystemDictionary::SoftReference_klass()->long_field_put(offset, value); 14.225 } 14.226 14.227 14.228 @@ -2538,7 +2538,7 @@ 14.229 // the generated bytecodes for reflection, and if so, "magically" 14.230 // delegate to its parent to prevent class loading from occurring 14.231 // in places where applications using reflection didn't expect it. 14.232 - klassOop delegating_cl_class = SystemDictionary::reflect_delegating_classloader_klass(); 14.233 + klassOop delegating_cl_class = SystemDictionary::reflect_DelegatingClassLoader_klass(); 14.234 // This might be null in non-1.4 JDKs 14.235 if (delegating_cl_class != NULL && loader->is_a(delegating_cl_class)) { 14.236 return parent(loader); 14.237 @@ -2553,7 +2553,7 @@ 14.238 void java_lang_System::compute_offsets() { 14.239 assert(offset_of_static_fields == 0, "offsets should be initialized only once"); 14.240 14.241 - instanceKlass* ik = instanceKlass::cast(SystemDictionary::system_klass()); 14.242 + instanceKlass* ik = instanceKlass::cast(SystemDictionary::System_klass()); 14.243 offset_of_static_fields = ik->offset_of_static_fields(); 14.244 } 14.245
15.1 --- a/src/share/vm/classfile/javaClasses.hpp Tue Jan 05 11:16:09 2010 -0800 15.2 +++ b/src/share/vm/classfile/javaClasses.hpp Wed Jan 06 14:22:39 2010 -0800 15.3 @@ -111,7 +111,7 @@ 15.4 15.5 // Testers 15.6 static bool is_instance(oop obj) { 15.7 - return obj != NULL && obj->klass() == SystemDictionary::string_klass(); 15.8 + return obj != NULL && obj->klass() == SystemDictionary::String_klass(); 15.9 } 15.10 15.11 // Debugging 15.12 @@ -161,7 +161,7 @@ 15.13 static void print_signature(oop java_class, outputStream *st); 15.14 // Testing 15.15 static bool is_instance(oop obj) { 15.16 - return obj != NULL && obj->klass() == SystemDictionary::class_klass(); 15.17 + return obj != NULL && obj->klass() == SystemDictionary::Class_klass(); 15.18 } 15.19 static bool is_primitive(oop java_class); 15.20 static BasicType primitive_type(oop java_class);
16.1 --- a/src/share/vm/classfile/systemDictionary.cpp Tue Jan 05 11:16:09 2010 -0800 16.2 +++ b/src/share/vm/classfile/systemDictionary.cpp Wed Jan 06 14:22:39 2010 -0800 16.3 @@ -60,10 +60,10 @@ 16.4 } 16.5 16.6 void SystemDictionary::compute_java_system_loader(TRAPS) { 16.7 - KlassHandle system_klass(THREAD, WK_KLASS(classloader_klass)); 16.8 + KlassHandle system_klass(THREAD, WK_KLASS(ClassLoader_klass)); 16.9 JavaValue result(T_OBJECT); 16.10 JavaCalls::call_static(&result, 16.11 - KlassHandle(THREAD, WK_KLASS(classloader_klass)), 16.12 + KlassHandle(THREAD, WK_KLASS(ClassLoader_klass)), 16.13 vmSymbolHandles::getSystemClassLoader_name(), 16.14 vmSymbolHandles::void_classloader_signature(), 16.15 CHECK); 16.16 @@ -128,7 +128,7 @@ 16.17 // in which case we have to check whether the pending exception is a ClassNotFoundException, 16.18 // and if so convert it to a NoClassDefFoundError 16.19 // And chain the original ClassNotFoundException 16.20 - if (throw_error && PENDING_EXCEPTION->is_a(SystemDictionary::classNotFoundException_klass())) { 16.21 + if (throw_error && PENDING_EXCEPTION->is_a(SystemDictionary::ClassNotFoundException_klass())) { 16.22 ResourceMark rm(THREAD); 16.23 assert(klass_h() == NULL, "Should not have result with exception pending"); 16.24 Handle e(THREAD, PENDING_EXCEPTION); 16.25 @@ -359,7 +359,7 @@ 16.26 16.27 assert(class_loader() != NULL, "should not have non-null protection domain for null classloader"); 16.28 16.29 - KlassHandle system_loader(THREAD, SystemDictionary::classloader_klass()); 16.30 + KlassHandle system_loader(THREAD, SystemDictionary::ClassLoader_klass()); 16.31 JavaCalls::call_special(&result, 16.32 class_loader, 16.33 system_loader, 16.34 @@ -743,7 +743,7 @@ 16.35 // Bootstrap goes through here to allow for an extra guarantee check 16.36 if (UnsyncloadClass || (class_loader.is_null())) { 16.37 if (k.is_null() && HAS_PENDING_EXCEPTION 16.38 - && PENDING_EXCEPTION->is_a(SystemDictionary::linkageError_klass())) { 16.39 + && PENDING_EXCEPTION->is_a(SystemDictionary::LinkageError_klass())) { 16.40 MutexLocker mu(SystemDictionary_lock, THREAD); 16.41 klassOop check = find_class(d_index, d_hash, name, class_loader); 16.42 if (check != NULL) { 16.43 @@ -1367,7 +1367,7 @@ 16.44 16.45 JavaValue result(T_OBJECT); 16.46 16.47 - KlassHandle spec_klass (THREAD, SystemDictionary::classloader_klass()); 16.48 + KlassHandle spec_klass (THREAD, SystemDictionary::ClassLoader_klass()); 16.49 16.50 // Call public unsynchronized loadClass(String) directly for all class loaders 16.51 // for parallelCapable class loaders. JDK >=7, loadClass(String, boolean) will 16.52 @@ -1944,13 +1944,13 @@ 16.53 16.54 16.55 void SystemDictionary::initialize_preloaded_classes(TRAPS) { 16.56 - assert(WK_KLASS(object_klass) == NULL, "preloaded classes should only be initialized once"); 16.57 + assert(WK_KLASS(Object_klass) == NULL, "preloaded classes should only be initialized once"); 16.58 // Preload commonly used klasses 16.59 WKID scan = FIRST_WKID; 16.60 // first do Object, String, Class 16.61 - initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(class_klass), scan, CHECK); 16.62 + initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK); 16.63 16.64 - debug_only(instanceKlass::verify_class_klass_nonstatic_oop_maps(WK_KLASS(class_klass))); 16.65 + debug_only(instanceKlass::verify_class_klass_nonstatic_oop_maps(WK_KLASS(Class_klass))); 16.66 16.67 // Fixup mirrors for classes loaded before java.lang.Class. 16.68 // These calls iterate over the objects currently in the perm gen 16.69 @@ -1961,17 +1961,17 @@ 16.70 Universe::fixup_mirrors(CHECK); 16.71 16.72 // do a bunch more: 16.73 - initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(reference_klass), scan, CHECK); 16.74 + initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Reference_klass), scan, CHECK); 16.75 16.76 // Preload ref klasses and set reference types 16.77 - instanceKlass::cast(WK_KLASS(reference_klass))->set_reference_type(REF_OTHER); 16.78 - instanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(reference_klass)); 16.79 + instanceKlass::cast(WK_KLASS(Reference_klass))->set_reference_type(REF_OTHER); 16.80 + instanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass)); 16.81 16.82 - initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(phantom_reference_klass), scan, CHECK); 16.83 - instanceKlass::cast(WK_KLASS(soft_reference_klass))->set_reference_type(REF_SOFT); 16.84 - instanceKlass::cast(WK_KLASS(weak_reference_klass))->set_reference_type(REF_WEAK); 16.85 - instanceKlass::cast(WK_KLASS(final_reference_klass))->set_reference_type(REF_FINAL); 16.86 - instanceKlass::cast(WK_KLASS(phantom_reference_klass))->set_reference_type(REF_PHANTOM); 16.87 + initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(PhantomReference_klass), scan, CHECK); 16.88 + instanceKlass::cast(WK_KLASS(SoftReference_klass))->set_reference_type(REF_SOFT); 16.89 + instanceKlass::cast(WK_KLASS(WeakReference_klass))->set_reference_type(REF_WEAK); 16.90 + instanceKlass::cast(WK_KLASS(FinalReference_klass))->set_reference_type(REF_FINAL); 16.91 + instanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM); 16.92 16.93 WKID meth_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass); 16.94 WKID meth_group_end = WK_KLASS_ENUM_NAME(WrongMethodTypeException_klass); 16.95 @@ -1996,14 +1996,14 @@ 16.96 16.97 initialize_wk_klasses_until(WKID_LIMIT, scan, CHECK); 16.98 16.99 - _box_klasses[T_BOOLEAN] = WK_KLASS(boolean_klass); 16.100 - _box_klasses[T_CHAR] = WK_KLASS(char_klass); 16.101 - _box_klasses[T_FLOAT] = WK_KLASS(float_klass); 16.102 - _box_klasses[T_DOUBLE] = WK_KLASS(double_klass); 16.103 - _box_klasses[T_BYTE] = WK_KLASS(byte_klass); 16.104 - _box_klasses[T_SHORT] = WK_KLASS(short_klass); 16.105 - _box_klasses[T_INT] = WK_KLASS(int_klass); 16.106 - _box_klasses[T_LONG] = WK_KLASS(long_klass); 16.107 + _box_klasses[T_BOOLEAN] = WK_KLASS(Boolean_klass); 16.108 + _box_klasses[T_CHAR] = WK_KLASS(Character_klass); 16.109 + _box_klasses[T_FLOAT] = WK_KLASS(Float_klass); 16.110 + _box_klasses[T_DOUBLE] = WK_KLASS(Double_klass); 16.111 + _box_klasses[T_BYTE] = WK_KLASS(Byte_klass); 16.112 + _box_klasses[T_SHORT] = WK_KLASS(Short_klass); 16.113 + _box_klasses[T_INT] = WK_KLASS(Integer_klass); 16.114 + _box_klasses[T_LONG] = WK_KLASS(Long_klass); 16.115 //_box_klasses[T_OBJECT] = WK_KLASS(object_klass); 16.116 //_box_klasses[T_ARRAY] = WK_KLASS(object_klass); 16.117 16.118 @@ -2014,11 +2014,11 @@ 16.119 #endif // KERNEL 16.120 16.121 { // Compute whether we should use loadClass or loadClassInternal when loading classes. 16.122 - methodOop method = instanceKlass::cast(classloader_klass())->find_method(vmSymbols::loadClassInternal_name(), vmSymbols::string_class_signature()); 16.123 + methodOop method = instanceKlass::cast(ClassLoader_klass())->find_method(vmSymbols::loadClassInternal_name(), vmSymbols::string_class_signature()); 16.124 _has_loadClassInternal = (method != NULL); 16.125 } 16.126 { // Compute whether we should use checkPackageAccess or NOT 16.127 - methodOop method = instanceKlass::cast(classloader_klass())->find_method(vmSymbols::checkPackageAccess_name(), vmSymbols::class_protectiondomain_signature()); 16.128 + methodOop method = instanceKlass::cast(ClassLoader_klass())->find_method(vmSymbols::checkPackageAccess_name(), vmSymbols::class_protectiondomain_signature()); 16.129 _has_checkPackageAccess = (method != NULL); 16.130 } 16.131 } 16.132 @@ -2374,7 +2374,7 @@ 16.133 TRAPS) { 16.134 Handle empty; 16.135 int npts = ArgumentCount(signature()).size(); 16.136 - objArrayHandle pts = oopFactory::new_objArray(SystemDictionary::class_klass(), npts, CHECK_(empty)); 16.137 + objArrayHandle pts = oopFactory::new_objArray(SystemDictionary::Class_klass(), npts, CHECK_(empty)); 16.138 int arg = 0; 16.139 Handle rt; // the return type from the signature 16.140 for (SignatureStream ss(signature()); !ss.is_done(); ss.next()) {
17.1 --- a/src/share/vm/classfile/systemDictionary.hpp Tue Jan 05 11:16:09 2010 -0800 17.2 +++ b/src/share/vm/classfile/systemDictionary.hpp Wed Jan 06 14:22:39 2010 -0800 17.3 @@ -82,55 +82,55 @@ 17.4 17.5 #define WK_KLASSES_DO(template) \ 17.6 /* well-known classes */ \ 17.7 - template(object_klass, java_lang_Object, Pre) \ 17.8 - template(string_klass, java_lang_String, Pre) \ 17.9 - template(class_klass, java_lang_Class, Pre) \ 17.10 - template(cloneable_klass, java_lang_Cloneable, Pre) \ 17.11 - template(classloader_klass, java_lang_ClassLoader, Pre) \ 17.12 - template(serializable_klass, java_io_Serializable, Pre) \ 17.13 - template(system_klass, java_lang_System, Pre) \ 17.14 - template(throwable_klass, java_lang_Throwable, Pre) \ 17.15 - template(error_klass, java_lang_Error, Pre) \ 17.16 - template(threaddeath_klass, java_lang_ThreadDeath, Pre) \ 17.17 - template(exception_klass, java_lang_Exception, Pre) \ 17.18 - template(runtime_exception_klass, java_lang_RuntimeException, Pre) \ 17.19 - template(protectionDomain_klass, java_security_ProtectionDomain, Pre) \ 17.20 + template(Object_klass, java_lang_Object, Pre) \ 17.21 + template(String_klass, java_lang_String, Pre) \ 17.22 + template(Class_klass, java_lang_Class, Pre) \ 17.23 + template(Cloneable_klass, java_lang_Cloneable, Pre) \ 17.24 + template(ClassLoader_klass, java_lang_ClassLoader, Pre) \ 17.25 + template(Serializable_klass, java_io_Serializable, Pre) \ 17.26 + template(System_klass, java_lang_System, Pre) \ 17.27 + template(Throwable_klass, java_lang_Throwable, Pre) \ 17.28 + template(Error_klass, java_lang_Error, Pre) \ 17.29 + template(ThreadDeath_klass, java_lang_ThreadDeath, Pre) \ 17.30 + template(Exception_klass, java_lang_Exception, Pre) \ 17.31 + template(RuntimeException_klass, java_lang_RuntimeException, Pre) \ 17.32 + template(ProtectionDomain_klass, java_security_ProtectionDomain, Pre) \ 17.33 template(AccessControlContext_klass, java_security_AccessControlContext, Pre) \ 17.34 - template(classNotFoundException_klass, java_lang_ClassNotFoundException, Pre) \ 17.35 - template(noClassDefFoundError_klass, java_lang_NoClassDefFoundError, Pre) \ 17.36 - template(linkageError_klass, java_lang_LinkageError, Pre) \ 17.37 + template(ClassNotFoundException_klass, java_lang_ClassNotFoundException, Pre) \ 17.38 + template(NoClassDefFoundError_klass, java_lang_NoClassDefFoundError, Pre) \ 17.39 + template(LinkageError_klass, java_lang_LinkageError, Pre) \ 17.40 template(ClassCastException_klass, java_lang_ClassCastException, Pre) \ 17.41 template(ArrayStoreException_klass, java_lang_ArrayStoreException, Pre) \ 17.42 - template(virtualMachineError_klass, java_lang_VirtualMachineError, Pre) \ 17.43 + template(VirtualMachineError_klass, java_lang_VirtualMachineError, Pre) \ 17.44 template(OutOfMemoryError_klass, java_lang_OutOfMemoryError, Pre) \ 17.45 template(StackOverflowError_klass, java_lang_StackOverflowError, Pre) \ 17.46 template(IllegalMonitorStateException_klass, java_lang_IllegalMonitorStateException, Pre) \ 17.47 - template(reference_klass, java_lang_ref_Reference, Pre) \ 17.48 + template(Reference_klass, java_lang_ref_Reference, Pre) \ 17.49 \ 17.50 /* Preload ref klasses and set reference types */ \ 17.51 - template(soft_reference_klass, java_lang_ref_SoftReference, Pre) \ 17.52 - template(weak_reference_klass, java_lang_ref_WeakReference, Pre) \ 17.53 - template(final_reference_klass, java_lang_ref_FinalReference, Pre) \ 17.54 - template(phantom_reference_klass, java_lang_ref_PhantomReference, Pre) \ 17.55 - template(finalizer_klass, java_lang_ref_Finalizer, Pre) \ 17.56 + template(SoftReference_klass, java_lang_ref_SoftReference, Pre) \ 17.57 + template(WeakReference_klass, java_lang_ref_WeakReference, Pre) \ 17.58 + template(FinalReference_klass, java_lang_ref_FinalReference, Pre) \ 17.59 + template(PhantomReference_klass, java_lang_ref_PhantomReference, Pre) \ 17.60 + template(Finalizer_klass, java_lang_ref_Finalizer, Pre) \ 17.61 \ 17.62 - template(thread_klass, java_lang_Thread, Pre) \ 17.63 - template(threadGroup_klass, java_lang_ThreadGroup, Pre) \ 17.64 - template(properties_klass, java_util_Properties, Pre) \ 17.65 - template(reflect_accessible_object_klass, java_lang_reflect_AccessibleObject, Pre) \ 17.66 - template(reflect_field_klass, java_lang_reflect_Field, Pre) \ 17.67 - template(reflect_method_klass, java_lang_reflect_Method, Pre) \ 17.68 - template(reflect_constructor_klass, java_lang_reflect_Constructor, Pre) \ 17.69 + template(Thread_klass, java_lang_Thread, Pre) \ 17.70 + template(ThreadGroup_klass, java_lang_ThreadGroup, Pre) \ 17.71 + template(Properties_klass, java_util_Properties, Pre) \ 17.72 + template(reflect_AccessibleObject_klass, java_lang_reflect_AccessibleObject, Pre) \ 17.73 + template(reflect_Field_klass, java_lang_reflect_Field, Pre) \ 17.74 + template(reflect_Method_klass, java_lang_reflect_Method, Pre) \ 17.75 + template(reflect_Constructor_klass, java_lang_reflect_Constructor, Pre) \ 17.76 \ 17.77 /* NOTE: needed too early in bootstrapping process to have checks based on JDK version */ \ 17.78 /* Universe::is_gte_jdk14x_version() is not set up by this point. */ \ 17.79 /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \ 17.80 - template(reflect_magic_klass, sun_reflect_MagicAccessorImpl, Opt) \ 17.81 - template(reflect_method_accessor_klass, sun_reflect_MethodAccessorImpl, Opt_Only_JDK14NewRef) \ 17.82 - template(reflect_constructor_accessor_klass, sun_reflect_ConstructorAccessorImpl, Opt_Only_JDK14NewRef) \ 17.83 - template(reflect_delegating_classloader_klass, sun_reflect_DelegatingClassLoader, Opt) \ 17.84 - template(reflect_constant_pool_klass, sun_reflect_ConstantPool, Opt_Only_JDK15) \ 17.85 - template(reflect_unsafe_static_field_accessor_impl_klass, sun_reflect_UnsafeStaticFieldAccessorImpl, Opt_Only_JDK15) \ 17.86 + template(reflect_MagicAccessorImpl_klass, sun_reflect_MagicAccessorImpl, Opt) \ 17.87 + template(reflect_MethodAccessorImpl_klass, sun_reflect_MethodAccessorImpl, Opt_Only_JDK14NewRef) \ 17.88 + template(reflect_ConstructorAccessorImpl_klass, sun_reflect_ConstructorAccessorImpl, Opt_Only_JDK14NewRef) \ 17.89 + template(reflect_DelegatingClassLoader_klass, sun_reflect_DelegatingClassLoader, Opt) \ 17.90 + template(reflect_ConstantPool_klass, sun_reflect_ConstantPool, Opt_Only_JDK15) \ 17.91 + template(reflect_UnsafeStaticFieldAccessorImpl_klass, sun_reflect_UnsafeStaticFieldAccessorImpl, Opt_Only_JDK15) \ 17.92 \ 17.93 /* support for dynamic typing; it's OK if these are NULL in earlier JDKs */ \ 17.94 template(MethodHandle_klass, java_dyn_MethodHandle, Opt) \ 17.95 @@ -147,13 +147,11 @@ 17.96 template(InvokeDynamic_klass, java_dyn_InvokeDynamic, Opt) \ 17.97 /* Note: MethodHandle must be first, and Dynamic last in group */ \ 17.98 \ 17.99 - template(vector_klass, java_util_Vector, Pre) \ 17.100 - template(hashtable_klass, java_util_Hashtable, Pre) \ 17.101 - template(stringBuffer_klass, java_lang_StringBuffer, Pre) \ 17.102 + template(StringBuffer_klass, java_lang_StringBuffer, Pre) \ 17.103 template(StringBuilder_klass, java_lang_StringBuilder, Pre) \ 17.104 \ 17.105 /* It's NULL in non-1.4 JDKs. */ \ 17.106 - template(stackTraceElement_klass, java_lang_StackTraceElement, Opt) \ 17.107 + template(StackTraceElement_klass, java_lang_StackTraceElement, Opt) \ 17.108 /* Universe::is_gte_jdk14x_version() is not set up by this point. */ \ 17.109 /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \ 17.110 template(java_nio_Buffer_klass, java_nio_Buffer, Opt) \ 17.111 @@ -164,14 +162,14 @@ 17.112 template(sun_jkernel_DownloadManager_klass, sun_jkernel_DownloadManager, Opt_Kernel) \ 17.113 \ 17.114 /* Preload boxing klasses */ \ 17.115 - template(boolean_klass, java_lang_Boolean, Pre) \ 17.116 - template(char_klass, java_lang_Character, Pre) \ 17.117 - template(float_klass, java_lang_Float, Pre) \ 17.118 - template(double_klass, java_lang_Double, Pre) \ 17.119 - template(byte_klass, java_lang_Byte, Pre) \ 17.120 - template(short_klass, java_lang_Short, Pre) \ 17.121 - template(int_klass, java_lang_Integer, Pre) \ 17.122 - template(long_klass, java_lang_Long, Pre) \ 17.123 + template(Boolean_klass, java_lang_Boolean, Pre) \ 17.124 + template(Character_klass, java_lang_Character, Pre) \ 17.125 + template(Float_klass, java_lang_Float, Pre) \ 17.126 + template(Double_klass, java_lang_Double, Pre) \ 17.127 + template(Byte_klass, java_lang_Byte, Pre) \ 17.128 + template(Short_klass, java_lang_Short, Pre) \ 17.129 + template(Integer_klass, java_lang_Integer, Pre) \ 17.130 + template(Long_klass, java_lang_Long, Pre) \ 17.131 /*end*/ 17.132 17.133 17.134 @@ -438,8 +436,8 @@ 17.135 // Tells whether ClassLoader.checkPackageAccess is present 17.136 static bool has_checkPackageAccess() { return _has_checkPackageAccess; } 17.137 17.138 - static bool class_klass_loaded() { return WK_KLASS(class_klass) != NULL; } 17.139 - static bool cloneable_klass_loaded() { return WK_KLASS(cloneable_klass) != NULL; } 17.140 + static bool Class_klass_loaded() { return WK_KLASS(Class_klass) != NULL; } 17.141 + static bool Cloneable_klass_loaded() { return WK_KLASS(Cloneable_klass) != NULL; } 17.142 17.143 // Returns default system loader 17.144 static oop java_system_loader();
18.1 --- a/src/share/vm/classfile/verifier.cpp Tue Jan 05 11:16:09 2010 -0800 18.2 +++ b/src/share/vm/classfile/verifier.cpp Wed Jan 06 14:22:39 2010 -0800 18.3 @@ -143,7 +143,7 @@ 18.4 18.5 bool Verifier::is_eligible_for_verification(instanceKlassHandle klass, bool should_verify_class) { 18.6 symbolOop name = klass->name(); 18.7 - klassOop refl_magic_klass = SystemDictionary::reflect_magic_klass(); 18.8 + klassOop refl_magic_klass = SystemDictionary::reflect_MagicAccessorImpl_klass(); 18.9 18.10 return (should_verify_for(klass->class_loader(), should_verify_class) && 18.11 // return if the class is a bootstrapping class
19.1 --- a/src/share/vm/gc_interface/collectedHeap.cpp Tue Jan 05 11:16:09 2010 -0800 19.2 +++ b/src/share/vm/gc_interface/collectedHeap.cpp Wed Jan 06 14:22:39 2010 -0800 19.3 @@ -274,7 +274,7 @@ 19.4 fill_with_array(start, words); 19.5 } else if (words > 0) { 19.6 assert(words == min_fill_size(), "unaligned size"); 19.7 - post_allocation_setup_common(SystemDictionary::object_klass(), start, 19.8 + post_allocation_setup_common(SystemDictionary::Object_klass(), start, 19.9 words); 19.10 } 19.11 }
20.1 --- a/src/share/vm/interpreter/interpreterRuntime.cpp Tue Jan 05 11:16:09 2010 -0800 20.2 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp Wed Jan 06 14:22:39 2010 -0800 20.3 @@ -353,7 +353,7 @@ 20.4 assert(h_exception.not_null(), "NULL exceptions should be handled by athrow"); 20.5 assert(h_exception->is_oop(), "just checking"); 20.6 // Check that exception is a subclass of Throwable, otherwise we have a VerifyError 20.7 - if (!(h_exception->is_a(SystemDictionary::throwable_klass()))) { 20.8 + if (!(h_exception->is_a(SystemDictionary::Throwable_klass()))) { 20.9 if (ExitVMOnVerifyError) vm_exit(-1); 20.10 ShouldNotReachHere(); 20.11 } 20.12 @@ -585,7 +585,7 @@ 20.13 Handle exception(thread, thread->vm_result()); 20.14 assert(exception() != NULL, "vm result should be set"); 20.15 thread->set_vm_result(NULL); // clear vm result before continuing (may cause memory leaks and assert failures) 20.16 - if (!exception->is_a(SystemDictionary::threaddeath_klass())) { 20.17 + if (!exception->is_a(SystemDictionary::ThreadDeath_klass())) { 20.18 exception = get_preinitialized_exception( 20.19 SystemDictionary::IllegalMonitorStateException_klass(), 20.20 CATCH); 20.21 @@ -660,7 +660,7 @@ 20.22 tty->print_cr("Resolving: klass: %s to method: %s", info.resolved_klass()->name()->as_C_string(), info.resolved_method()->name()->as_C_string()); 20.23 } 20.24 if (info.resolved_method()->method_holder() == 20.25 - SystemDictionary::object_klass()) { 20.26 + SystemDictionary::Object_klass()) { 20.27 // NOTE: THIS IS A FIX FOR A CORNER CASE in the JVM spec 20.28 // (see also cpCacheOop.cpp for details) 20.29 methodHandle rm = info.resolved_method();
21.1 --- a/src/share/vm/interpreter/linkResolver.cpp Tue Jan 05 11:16:09 2010 -0800 21.2 +++ b/src/share/vm/interpreter/linkResolver.cpp Wed Jan 06 14:22:39 2010 -0800 21.3 @@ -55,7 +55,7 @@ 21.4 // we should pick the vtable index from the resolved method. 21.5 // Other than that case, there is no valid vtable index to specify. 21.6 int vtable_index = methodOopDesc::invalid_vtable_index; 21.7 - if (resolved_method->method_holder() == SystemDictionary::object_klass()) { 21.8 + if (resolved_method->method_holder() == SystemDictionary::Object_klass()) { 21.9 assert(resolved_method->vtable_index() == selected_method->vtable_index(), "sanity check"); 21.10 vtable_index = resolved_method->vtable_index(); 21.11 } 21.12 @@ -193,7 +193,7 @@ 21.13 // We'll check for the method name first, as that's most likely 21.14 // to be false (so we'll short-circuit out of these tests). 21.15 if (sel_method->name() == vmSymbols::clone_name() && 21.16 - sel_klass() == SystemDictionary::object_klass() && 21.17 + sel_klass() == SystemDictionary::Object_klass() && 21.18 resolved_klass->oop_is_array()) { 21.19 // We need to change "protected" to "public". 21.20 assert(flags.is_protected(), "clone not protected?");
22.1 --- a/src/share/vm/memory/classify.cpp Tue Jan 05 11:16:09 2010 -0800 22.2 +++ b/src/share/vm/memory/classify.cpp Wed Jan 06 14:22:39 2010 -0800 22.3 @@ -49,7 +49,7 @@ 22.4 22.5 Klass* k = obj->blueprint(); 22.6 22.7 - if (k->as_klassOop() == SystemDictionary::object_klass()) { 22.8 + if (k->as_klassOop() == SystemDictionary::Object_klass()) { 22.9 tty->print_cr("Found the class!"); 22.10 } 22.11
23.1 --- a/src/share/vm/memory/dump.cpp Tue Jan 05 11:16:09 2010 -0800 23.2 +++ b/src/share/vm/memory/dump.cpp Wed Jan 06 14:22:39 2010 -0800 23.3 @@ -63,7 +63,7 @@ 23.4 void do_oop(oop* p) { 23.5 if (p != NULL) { 23.6 oop obj = *p; 23.7 - if (obj->klass() == SystemDictionary::string_klass()) { 23.8 + if (obj->klass() == SystemDictionary::String_klass()) { 23.9 23.10 int hash; 23.11 typeArrayOop value = java_lang_String::value(obj); 23.12 @@ -625,11 +625,11 @@ 23.13 23.14 if (obj->is_klass() || obj->is_instance()) { 23.15 if (obj->is_klass() || 23.16 - obj->is_a(SystemDictionary::class_klass()) || 23.17 - obj->is_a(SystemDictionary::throwable_klass())) { 23.18 + obj->is_a(SystemDictionary::Class_klass()) || 23.19 + obj->is_a(SystemDictionary::Throwable_klass())) { 23.20 // Do nothing 23.21 } 23.22 - else if (obj->is_a(SystemDictionary::string_klass())) { 23.23 + else if (obj->is_a(SystemDictionary::String_klass())) { 23.24 // immutable objects. 23.25 } else { 23.26 // someone added an object we hadn't accounted for.
24.1 --- a/src/share/vm/memory/referenceProcessor.cpp Tue Jan 05 11:16:09 2010 -0800 24.2 +++ b/src/share/vm/memory/referenceProcessor.cpp Wed Jan 06 14:22:39 2010 -0800 24.3 @@ -71,7 +71,7 @@ 24.4 assert(_sentinelRef == NULL, "should be initialized precisely once"); 24.5 EXCEPTION_MARK; 24.6 _sentinelRef = instanceKlass::cast( 24.7 - SystemDictionary::reference_klass())-> 24.8 + SystemDictionary::Reference_klass())-> 24.9 allocate_permanent_instance(THREAD); 24.10 24.11 // Initialize the master soft ref clock.
25.1 --- a/src/share/vm/memory/space.cpp Tue Jan 05 11:16:09 2010 -0800 25.2 +++ b/src/share/vm/memory/space.cpp Wed Jan 06 14:22:39 2010 -0800 25.3 @@ -876,7 +876,7 @@ 25.4 instanceOop obj = (instanceOop) allocate(size); 25.5 obj->set_mark(markOopDesc::prototype()); 25.6 obj->set_klass_gap(0); 25.7 - obj->set_klass(SystemDictionary::object_klass()); 25.8 + obj->set_klass(SystemDictionary::Object_klass()); 25.9 } 25.10 } 25.11
26.1 --- a/src/share/vm/memory/universe.cpp Tue Jan 05 11:16:09 2010 -0800 26.2 +++ b/src/share/vm/memory/universe.cpp Wed Jan 06 14:22:39 2010 -0800 26.3 @@ -291,7 +291,7 @@ 26.4 26.5 SystemDictionary::initialize(CHECK); 26.6 26.7 - klassOop ok = SystemDictionary::object_klass(); 26.8 + klassOop ok = SystemDictionary::Object_klass(); 26.9 26.10 _the_null_string = StringTable::intern("null", CHECK); 26.11 _the_min_jint_string = StringTable::intern("-2147483648", CHECK); 26.12 @@ -299,9 +299,9 @@ 26.13 if (UseSharedSpaces) { 26.14 // Verify shared interfaces array. 26.15 assert(_the_array_interfaces_array->obj_at(0) == 26.16 - SystemDictionary::cloneable_klass(), "u3"); 26.17 + SystemDictionary::Cloneable_klass(), "u3"); 26.18 assert(_the_array_interfaces_array->obj_at(1) == 26.19 - SystemDictionary::serializable_klass(), "u3"); 26.20 + SystemDictionary::Serializable_klass(), "u3"); 26.21 26.22 // Verify element klass for system obj array klass 26.23 assert(objArrayKlass::cast(_systemObjArrayKlassObj)->element_klass() == ok, "u1"); 26.24 @@ -320,8 +320,8 @@ 26.25 assert(Klass::cast(systemObjArrayKlassObj())->super() == ok, "u3"); 26.26 } else { 26.27 // Set up shared interfaces array. (Do this before supers are set up.) 26.28 - _the_array_interfaces_array->obj_at_put(0, SystemDictionary::cloneable_klass()); 26.29 - _the_array_interfaces_array->obj_at_put(1, SystemDictionary::serializable_klass()); 26.30 + _the_array_interfaces_array->obj_at_put(0, SystemDictionary::Cloneable_klass()); 26.31 + _the_array_interfaces_array->obj_at_put(1, SystemDictionary::Serializable_klass()); 26.32 26.33 // Set element klass for system obj array klass 26.34 objArrayKlass::cast(_systemObjArrayKlassObj)->set_element_klass(ok); 26.35 @@ -365,7 +365,7 @@ 26.36 // Initialize _objectArrayKlass after core bootstraping to make 26.37 // sure the super class is set up properly for _objectArrayKlass. 26.38 _objectArrayKlassObj = instanceKlass:: 26.39 - cast(SystemDictionary::object_klass())->array_klass(1, CHECK); 26.40 + cast(SystemDictionary::Object_klass())->array_klass(1, CHECK); 26.41 // Add the class to the class hierarchy manually to make sure that 26.42 // its vtable is initialized after core bootstrapping is completed. 26.43 Klass::cast(_objectArrayKlassObj)->append_to_sibling_list(); 26.44 @@ -426,11 +426,11 @@ 26.45 while (i < size) { 26.46 if (!UseConcMarkSweepGC) { 26.47 // Allocate dummy in old generation 26.48 - oop dummy = instanceKlass::cast(SystemDictionary::object_klass())->allocate_instance(CHECK); 26.49 + oop dummy = instanceKlass::cast(SystemDictionary::Object_klass())->allocate_instance(CHECK); 26.50 dummy_array->obj_at_put(i++, dummy); 26.51 } 26.52 // Allocate dummy in permanent generation 26.53 - oop dummy = instanceKlass::cast(SystemDictionary::object_klass())->allocate_permanent_instance(CHECK); 26.54 + oop dummy = instanceKlass::cast(SystemDictionary::Object_klass())->allocate_permanent_instance(CHECK); 26.55 dummy_array->obj_at_put(i++, dummy); 26.56 } 26.57 { 26.58 @@ -540,7 +540,7 @@ 26.59 // but we cannot do that for classes created before java.lang.Class is loaded. Here we simply 26.60 // walk over permanent objects created so far (mostly classes) and fixup their mirrors. Note 26.61 // that the number of objects allocated at this point is very small. 26.62 - assert(SystemDictionary::class_klass_loaded(), "java.lang.Class should be loaded"); 26.63 + assert(SystemDictionary::Class_klass_loaded(), "java.lang.Class should be loaded"); 26.64 FixupMirrorClosure blk; 26.65 Universe::heap()->permanent_object_iterate(&blk); 26.66 } 26.67 @@ -556,7 +556,7 @@ 26.68 if (TraceReferenceGC) tty->print_cr("Callback to run finalizers on exit"); 26.69 { 26.70 PRESERVE_EXCEPTION_MARK; 26.71 - KlassHandle finalizer_klass(THREAD, SystemDictionary::finalizer_klass()); 26.72 + KlassHandle finalizer_klass(THREAD, SystemDictionary::Finalizer_klass()); 26.73 JavaValue result(T_VOID); 26.74 JavaCalls::call_static( 26.75 &result, 26.76 @@ -950,7 +950,7 @@ 26.77 { ResourceMark rm; 26.78 Interpreter::initialize(); // needed for interpreter entry points 26.79 if (!UseSharedSpaces) { 26.80 - KlassHandle ok_h(THREAD, SystemDictionary::object_klass()); 26.81 + KlassHandle ok_h(THREAD, SystemDictionary::Object_klass()); 26.82 Universe::reinitialize_vtable_of(ok_h, CHECK_false); 26.83 Universe::reinitialize_itables(CHECK_false); 26.84 } 26.85 @@ -960,7 +960,7 @@ 26.86 instanceKlassHandle k_h; 26.87 if (!UseSharedSpaces) { 26.88 // Setup preallocated empty java.lang.Class array 26.89 - Universe::_the_empty_class_klass_array = oopFactory::new_objArray(SystemDictionary::class_klass(), 0, CHECK_false); 26.90 + Universe::_the_empty_class_klass_array = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_false); 26.91 // Setup preallocated OutOfMemoryError errors 26.92 k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_OutOfMemoryError(), true, CHECK_false); 26.93 k_h = instanceKlassHandle(THREAD, k); 26.94 @@ -1027,8 +1027,8 @@ 26.95 // Setup static method for registering finalizers 26.96 // The finalizer klass must be linked before looking up the method, in 26.97 // case it needs to get rewritten. 26.98 - instanceKlass::cast(SystemDictionary::finalizer_klass())->link_class(CHECK_false); 26.99 - methodOop m = instanceKlass::cast(SystemDictionary::finalizer_klass())->find_method( 26.100 + instanceKlass::cast(SystemDictionary::Finalizer_klass())->link_class(CHECK_false); 26.101 + methodOop m = instanceKlass::cast(SystemDictionary::Finalizer_klass())->find_method( 26.102 vmSymbols::register_method_name(), 26.103 vmSymbols::register_method_signature()); 26.104 if (m == NULL || !m->is_static()) { 26.105 @@ -1036,7 +1036,7 @@ 26.106 "java.lang.ref.Finalizer.register", false); 26.107 } 26.108 Universe::_finalizer_register_cache->init( 26.109 - SystemDictionary::finalizer_klass(), m, CHECK_false); 26.110 + SystemDictionary::Finalizer_klass(), m, CHECK_false); 26.111 26.112 // Resolve on first use and initialize class. 26.113 // Note: No race-condition here, since a resolve will always return the same result 26.114 @@ -1053,14 +1053,14 @@ 26.115 Universe::_reflect_invoke_cache->init(k_h(), m, CHECK_false); 26.116 26.117 // Setup method for registering loaded classes in class loader vector 26.118 - instanceKlass::cast(SystemDictionary::classloader_klass())->link_class(CHECK_false); 26.119 - m = instanceKlass::cast(SystemDictionary::classloader_klass())->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature()); 26.120 + instanceKlass::cast(SystemDictionary::ClassLoader_klass())->link_class(CHECK_false); 26.121 + m = instanceKlass::cast(SystemDictionary::ClassLoader_klass())->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature()); 26.122 if (m == NULL || m->is_static()) { 26.123 THROW_MSG_(vmSymbols::java_lang_NoSuchMethodException(), 26.124 "java.lang.ClassLoader.addClass", false); 26.125 } 26.126 Universe::_loader_addClass_cache->init( 26.127 - SystemDictionary::classloader_klass(), m, CHECK_false); 26.128 + SystemDictionary::ClassLoader_klass(), m, CHECK_false); 26.129 26.130 // The folowing is initializing converter functions for serialization in 26.131 // JVM.cpp. If we clean up the StrictMath code above we may want to find
27.1 --- a/src/share/vm/oops/arrayKlass.cpp Tue Jan 05 11:16:09 2010 -0800 27.2 +++ b/src/share/vm/oops/arrayKlass.cpp Wed Jan 06 14:22:39 2010 -0800 27.3 @@ -43,7 +43,7 @@ 27.4 if (super() == NULL) return NULL; // bootstrap case 27.5 // Array klasses have primary supertypes which are not reported to Java. 27.6 // Example super chain: String[][] -> Object[][] -> Object[] -> Object 27.7 - return SystemDictionary::object_klass(); 27.8 + return SystemDictionary::Object_klass(); 27.9 } 27.10 27.11 27.12 @@ -82,7 +82,7 @@ 27.13 k = arrayKlassHandle(THREAD, base_klass()); 27.14 27.15 assert(!k()->is_parsable(), "not expecting parsability yet."); 27.16 - k->set_super(Universe::is_bootstrapping() ? (klassOop)NULL : SystemDictionary::object_klass()); 27.17 + k->set_super(Universe::is_bootstrapping() ? (klassOop)NULL : SystemDictionary::Object_klass()); 27.18 k->set_layout_helper(Klass::_lh_neutral_value); 27.19 k->set_dimension(1); 27.20 k->set_higher_dimension(NULL); 27.21 @@ -117,9 +117,9 @@ 27.22 27.23 bool arrayKlass::compute_is_subtype_of(klassOop k) { 27.24 // An array is a subtype of Serializable, Clonable, and Object 27.25 - return k == SystemDictionary::object_klass() 27.26 - || k == SystemDictionary::cloneable_klass() 27.27 - || k == SystemDictionary::serializable_klass(); 27.28 + return k == SystemDictionary::Object_klass() 27.29 + || k == SystemDictionary::Cloneable_klass() 27.30 + || k == SystemDictionary::Serializable_klass(); 27.31 } 27.32 27.33
28.1 --- a/src/share/vm/oops/arrayKlass.hpp Tue Jan 05 11:16:09 2010 -0800 28.2 +++ b/src/share/vm/oops/arrayKlass.hpp Wed Jan 06 14:22:39 2010 -0800 28.3 @@ -67,7 +67,7 @@ 28.4 // Compiler/Interpreter offset 28.5 static ByteSize component_mirror_offset() { return byte_offset_of(arrayKlass, _component_mirror); } 28.6 28.7 - virtual klassOop java_super() const;//{ return SystemDictionary::object_klass(); } 28.8 + virtual klassOop java_super() const;//{ return SystemDictionary::Object_klass(); } 28.9 28.10 // Allocation 28.11 // Sizes points to the first dimension of the array, subsequent dimensions
29.1 --- a/src/share/vm/oops/constantPoolOop.cpp Tue Jan 05 11:16:09 2010 -0800 29.2 +++ b/src/share/vm/oops/constantPoolOop.cpp Wed Jan 06 14:22:39 2010 -0800 29.3 @@ -110,7 +110,7 @@ 29.4 } 29.5 29.6 if (!PENDING_EXCEPTION-> 29.7 - is_a(SystemDictionary::linkageError_klass())) { 29.8 + is_a(SystemDictionary::LinkageError_klass())) { 29.9 // Just throw the exception and don't prevent these classes from 29.10 // being loaded due to virtual machine errors like StackOverflow 29.11 // and OutOfMemoryError, etc, or if the thread was hit by stop()
30.1 --- a/src/share/vm/oops/instanceKlass.cpp Tue Jan 05 11:16:09 2010 -0800 30.2 +++ b/src/share/vm/oops/instanceKlass.cpp Wed Jan 06 14:22:39 2010 -0800 30.3 @@ -383,7 +383,7 @@ 30.4 this_oop->set_initialization_state_and_notify(initialization_error, THREAD); 30.5 CLEAR_PENDING_EXCEPTION; // ignore any exception thrown, class initialization error is thrown below 30.6 } 30.7 - if (e->is_a(SystemDictionary::error_klass())) { 30.8 + if (e->is_a(SystemDictionary::Error_klass())) { 30.9 THROW_OOP(e()); 30.10 } else { 30.11 JavaCallArguments args(e); 30.12 @@ -568,7 +568,7 @@ 30.13 THROW_MSG(throwError ? vmSymbols::java_lang_InstantiationError() 30.14 : vmSymbols::java_lang_InstantiationException(), external_name()); 30.15 } 30.16 - if (as_klassOop() == SystemDictionary::class_klass()) { 30.17 + if (as_klassOop() == SystemDictionary::Class_klass()) { 30.18 ResourceMark rm(THREAD); 30.19 THROW_MSG(throwError ? vmSymbols::java_lang_IllegalAccessError() 30.20 : vmSymbols::java_lang_IllegalAccessException(), external_name()); 30.21 @@ -2223,7 +2223,7 @@ 30.22 void instanceKlass::oop_print_on(oop obj, outputStream* st) { 30.23 Klass::oop_print_on(obj, st); 30.24 30.25 - if (as_klassOop() == SystemDictionary::string_klass()) { 30.26 + if (as_klassOop() == SystemDictionary::String_klass()) { 30.27 typeArrayOop value = java_lang_String::value(obj); 30.28 juint offset = java_lang_String::offset(obj); 30.29 juint length = java_lang_String::length(obj); 30.30 @@ -2243,7 +2243,7 @@ 30.31 FieldPrinter print_nonstatic_field(st, obj); 30.32 do_nonstatic_fields(&print_nonstatic_field); 30.33 30.34 - if (as_klassOop() == SystemDictionary::class_klass()) { 30.35 + if (as_klassOop() == SystemDictionary::Class_klass()) { 30.36 st->print(BULLET"signature: "); 30.37 java_lang_Class::print_signature(obj, st); 30.38 st->cr(); 30.39 @@ -2270,7 +2270,7 @@ 30.40 st->print("a "); 30.41 name()->print_value_on(st); 30.42 obj->print_address_on(st); 30.43 - if (as_klassOop() == SystemDictionary::string_klass() 30.44 + if (as_klassOop() == SystemDictionary::String_klass() 30.45 && java_lang_String::value(obj) != NULL) { 30.46 ResourceMark rm; 30.47 int len = java_lang_String::length(obj); 30.48 @@ -2279,7 +2279,7 @@ 30.49 st->print(" = \"%s\"", str); 30.50 if (len > plen) 30.51 st->print("...[%d]", len); 30.52 - } else if (as_klassOop() == SystemDictionary::class_klass()) { 30.53 + } else if (as_klassOop() == SystemDictionary::Class_klass()) { 30.54 klassOop k = java_lang_Class::as_klassOop(obj); 30.55 st->print(" = "); 30.56 if (k != NULL) { 30.57 @@ -2346,7 +2346,7 @@ 30.58 30.59 // Check that we have the right class 30.60 static bool first_time = true; 30.61 - guarantee(k == SystemDictionary::class_klass() && first_time, "Invalid verify of maps"); 30.62 + guarantee(k == SystemDictionary::Class_klass() && first_time, "Invalid verify of maps"); 30.63 first_time = false; 30.64 const int extra = java_lang_Class::number_of_fake_oop_fields; 30.65 guarantee(ik->nonstatic_field_size() == extra, "just checking");
31.1 --- a/src/share/vm/oops/instanceRefKlass.cpp Tue Jan 05 11:16:09 2010 -0800 31.2 +++ b/src/share/vm/oops/instanceRefKlass.cpp Wed Jan 06 14:22:39 2010 -0800 31.3 @@ -397,7 +397,7 @@ 31.4 31.5 // Check that we have the right class 31.6 debug_only(static bool first_time = true); 31.7 - assert(k == SystemDictionary::reference_klass() && first_time, 31.8 + assert(k == SystemDictionary::Reference_klass() && first_time, 31.9 "Invalid update of maps"); 31.10 debug_only(first_time = false); 31.11 assert(ik->nonstatic_oop_map_count() == 1, "just checking");
32.1 --- a/src/share/vm/oops/klass.cpp Tue Jan 05 11:16:09 2010 -0800 32.2 +++ b/src/share/vm/oops/klass.cpp Wed Jan 06 14:22:39 2010 -0800 32.3 @@ -217,8 +217,8 @@ 32.4 set_super(NULL); 32.5 oop_store_without_check((oop*) &_primary_supers[0], (oop) this->as_klassOop()); 32.6 assert(super_depth() == 0, "Object must already be initialized properly"); 32.7 - } else if (k != super() || k == SystemDictionary::object_klass()) { 32.8 - assert(super() == NULL || super() == SystemDictionary::object_klass(), 32.9 + } else if (k != super() || k == SystemDictionary::Object_klass()) { 32.10 + assert(super() == NULL || super() == SystemDictionary::Object_klass(), 32.11 "initialize this only once to a non-trivial value"); 32.12 set_super(k); 32.13 Klass* sup = k->klass_part(); 32.14 @@ -370,7 +370,7 @@ 32.15 void Klass::remove_from_sibling_list() { 32.16 // remove receiver from sibling list 32.17 instanceKlass* super = superklass(); 32.18 - assert(super != NULL || as_klassOop() == SystemDictionary::object_klass(), "should have super"); 32.19 + assert(super != NULL || as_klassOop() == SystemDictionary::Object_klass(), "should have super"); 32.20 if (super == NULL) return; // special case: class Object 32.21 if (super->subklass() == this) { 32.22 // first subklass
33.1 --- a/src/share/vm/oops/methodOop.cpp Tue Jan 05 11:16:09 2010 -0800 33.2 +++ b/src/share/vm/oops/methodOop.cpp Wed Jan 06 14:22:39 2010 -0800 33.3 @@ -456,12 +456,12 @@ 33.4 return objArrayHandle(THREAD, Universe::the_empty_class_klass_array()); 33.5 } else { 33.6 methodHandle h_this(THREAD, this_oop); 33.7 - objArrayOop m_oop = oopFactory::new_objArray(SystemDictionary::class_klass(), length, CHECK_(objArrayHandle())); 33.8 + objArrayOop m_oop = oopFactory::new_objArray(SystemDictionary::Class_klass(), length, CHECK_(objArrayHandle())); 33.9 objArrayHandle mirrors (THREAD, m_oop); 33.10 for (int i = 0; i < length; i++) { 33.11 CheckedExceptionElement* table = h_this->checked_exceptions_start(); // recompute on each iteration, not gc safe 33.12 klassOop k = h_this->constants()->klass_at(table[i].class_cp_index, CHECK_(objArrayHandle())); 33.13 - assert(Klass::cast(k)->is_subclass_of(SystemDictionary::throwable_klass()), "invalid exception class"); 33.14 + assert(Klass::cast(k)->is_subclass_of(SystemDictionary::Throwable_klass()), "invalid exception class"); 33.15 mirrors->obj_at_put(i, Klass::cast(k)->java_mirror()); 33.16 } 33.17 return mirrors; 33.18 @@ -1032,8 +1032,8 @@ 33.19 // We are loading classes eagerly. If a ClassNotFoundException or 33.20 // a LinkageError was generated, be sure to ignore it. 33.21 if (HAS_PENDING_EXCEPTION) { 33.22 - if (PENDING_EXCEPTION->is_a(SystemDictionary::classNotFoundException_klass()) || 33.23 - PENDING_EXCEPTION->is_a(SystemDictionary::linkageError_klass())) { 33.24 + if (PENDING_EXCEPTION->is_a(SystemDictionary::ClassNotFoundException_klass()) || 33.25 + PENDING_EXCEPTION->is_a(SystemDictionary::LinkageError_klass())) { 33.26 CLEAR_PENDING_EXCEPTION; 33.27 } else { 33.28 return false;
34.1 --- a/src/share/vm/oops/objArrayKlass.cpp Tue Jan 05 11:16:09 2010 -0800 34.2 +++ b/src/share/vm/oops/objArrayKlass.cpp Wed Jan 06 14:22:39 2010 -0800 34.3 @@ -246,8 +246,8 @@ 34.4 } else { 34.5 objArrayOop sec_oop = oopFactory::new_system_objArray(num_secondaries, CHECK_NULL); 34.6 objArrayHandle secondaries(THREAD, sec_oop); 34.7 - secondaries->obj_at_put(num_extra_slots+0, SystemDictionary::cloneable_klass()); 34.8 - secondaries->obj_at_put(num_extra_slots+1, SystemDictionary::serializable_klass()); 34.9 + secondaries->obj_at_put(num_extra_slots+0, SystemDictionary::Cloneable_klass()); 34.10 + secondaries->obj_at_put(num_extra_slots+1, SystemDictionary::Serializable_klass()); 34.11 for (int i = 0; i < num_elem_supers; i++) { 34.12 klassOop elem_super = (klassOop) elem_supers->obj_at(i); 34.13 klassOop array_super = elem_super->klass_part()->array_klass_or_null();
35.1 --- a/src/share/vm/oops/objArrayKlassKlass.cpp Tue Jan 05 11:16:09 2010 -0800 35.2 +++ b/src/share/vm/oops/objArrayKlassKlass.cpp Wed Jan 06 14:22:39 2010 -0800 35.3 @@ -99,7 +99,7 @@ 35.4 } 35.5 } else { 35.6 // The element type is already Object. Object[] has direct super of Object. 35.7 - super_klass = KlassHandle(THREAD, SystemDictionary::object_klass()); 35.8 + super_klass = KlassHandle(THREAD, SystemDictionary::Object_klass()); 35.9 } 35.10 } 35.11
36.1 --- a/src/share/vm/opto/runtime.cpp Tue Jan 05 11:16:09 2010 -0800 36.2 +++ b/src/share/vm/opto/runtime.cpp Wed Jan 06 14:22:39 2010 -0800 36.3 @@ -790,7 +790,7 @@ 36.4 NOT_PRODUCT(Exceptions::debug_check_abort(exception)); 36.5 36.6 #ifdef ASSERT 36.7 - if (!(exception->is_a(SystemDictionary::throwable_klass()))) { 36.8 + if (!(exception->is_a(SystemDictionary::Throwable_klass()))) { 36.9 // should throw an exception here 36.10 ShouldNotReachHere(); 36.11 } 36.12 @@ -939,7 +939,7 @@ 36.13 #endif 36.14 assert (exception != NULL, "should have thrown a NULLPointerException"); 36.15 #ifdef ASSERT 36.16 - if (!(exception->is_a(SystemDictionary::throwable_klass()))) { 36.17 + if (!(exception->is_a(SystemDictionary::Throwable_klass()))) { 36.18 // should throw an exception here 36.19 ShouldNotReachHere(); 36.20 }
37.1 --- a/src/share/vm/prims/jni.cpp Tue Jan 05 11:16:09 2010 -0800 37.2 +++ b/src/share/vm/prims/jni.cpp Wed Jan 06 14:22:39 2010 -0800 37.3 @@ -396,11 +396,11 @@ 37.4 oop mirror = NULL; 37.5 int slot = 0; 37.6 37.7 - if (reflected->klass() == SystemDictionary::reflect_constructor_klass()) { 37.8 + if (reflected->klass() == SystemDictionary::reflect_Constructor_klass()) { 37.9 mirror = java_lang_reflect_Constructor::clazz(reflected); 37.10 slot = java_lang_reflect_Constructor::slot(reflected); 37.11 } else { 37.12 - assert(reflected->klass() == SystemDictionary::reflect_method_klass(), "wrong type"); 37.13 + assert(reflected->klass() == SystemDictionary::reflect_Method_klass(), "wrong type"); 37.14 mirror = java_lang_reflect_Method::clazz(reflected); 37.15 slot = java_lang_reflect_Method::slot(reflected); 37.16 } 37.17 @@ -496,7 +496,7 @@ 37.18 klassOop super = Klass::cast(k)->java_super(); 37.19 // super2 is the value computed by the compiler's getSuperClass intrinsic: 37.20 debug_only(klassOop super2 = ( Klass::cast(k)->oop_is_javaArray() 37.21 - ? SystemDictionary::object_klass() 37.22 + ? SystemDictionary::Object_klass() 37.23 : Klass::cast(k)->super() ) ); 37.24 assert(super == super2, 37.25 "java_super computation depends on interface, array, other super"); 37.26 @@ -584,7 +584,7 @@ 37.27 if (thread->has_pending_exception()) { 37.28 Handle ex(thread, thread->pending_exception()); 37.29 thread->clear_pending_exception(); 37.30 - if (ex->is_a(SystemDictionary::threaddeath_klass())) { 37.31 + if (ex->is_a(SystemDictionary::ThreadDeath_klass())) { 37.32 // Don't print anything if we are being killed. 37.33 } else { 37.34 jio_fprintf(defaultStream::error_stream(), "Exception "); 37.35 @@ -593,12 +593,12 @@ 37.36 jio_fprintf(defaultStream::error_stream(), 37.37 "in thread \"%s\" ", thread->get_thread_name()); 37.38 } 37.39 - if (ex->is_a(SystemDictionary::throwable_klass())) { 37.40 + if (ex->is_a(SystemDictionary::Throwable_klass())) { 37.41 JavaValue result(T_VOID); 37.42 JavaCalls::call_virtual(&result, 37.43 ex, 37.44 KlassHandle(THREAD, 37.45 - SystemDictionary::throwable_klass()), 37.46 + SystemDictionary::Throwable_klass()), 37.47 vmSymbolHandles::printStackTrace_name(), 37.48 vmSymbolHandles::void_method_signature(), 37.49 THREAD);
38.1 --- a/src/share/vm/prims/jniCheck.cpp Tue Jan 05 11:16:09 2010 -0800 38.2 +++ b/src/share/vm/prims/jniCheck.cpp Wed Jan 06 14:22:39 2010 -0800 38.3 @@ -341,7 +341,7 @@ 38.4 ReportJNIFatalError(thr, fatal_received_null_class); 38.5 } 38.6 38.7 - if (mirror->klass() != SystemDictionary::class_klass()) { 38.8 + if (mirror->klass() != SystemDictionary::Class_klass()) { 38.9 ReportJNIFatalError(thr, fatal_class_not_a_class); 38.10 } 38.11 38.12 @@ -358,7 +358,7 @@ 38.13 assert(klass != NULL, "klass argument must have a value"); 38.14 38.15 if (!Klass::cast(klass)->oop_is_instance() || 38.16 - !instanceKlass::cast(klass)->is_subclass_of(SystemDictionary::throwable_klass())) { 38.17 + !instanceKlass::cast(klass)->is_subclass_of(SystemDictionary::Throwable_klass())) { 38.18 ReportJNIFatalError(thr, fatal_class_not_a_throwable_class); 38.19 } 38.20 }
39.1 --- a/src/share/vm/prims/jvm.cpp Tue Jan 05 11:16:09 2010 -0800 39.2 +++ b/src/share/vm/prims/jvm.cpp Wed Jan 06 14:22:39 2010 -0800 39.3 @@ -80,7 +80,7 @@ 39.4 39.5 while (!vfst.at_end()) { 39.6 methodOop m = vfst.method(); 39.7 - if (!vfst.method()->method_holder()->klass_part()->is_subclass_of(SystemDictionary::classloader_klass())&& 39.8 + if (!vfst.method()->method_holder()->klass_part()->is_subclass_of(SystemDictionary::ClassLoader_klass())&& 39.9 !vfst.method()->method_holder()->klass_part()->is_subclass_of(access_controller_klass) && 39.10 !vfst.method()->method_holder()->klass_part()->is_subclass_of(privileged_action_klass)) { 39.11 break; 39.12 @@ -257,7 +257,7 @@ 39.13 Handle value_str = java_lang_String::create_from_platform_dependent_str((value != NULL ? value : ""), CHECK); 39.14 JavaCalls::call_virtual(&r, 39.15 props, 39.16 - KlassHandle(THREAD, SystemDictionary::properties_klass()), 39.17 + KlassHandle(THREAD, SystemDictionary::Properties_klass()), 39.18 vmSymbolHandles::put_name(), 39.19 vmSymbolHandles::object_object_object_signature(), 39.20 key_str, 39.21 @@ -495,7 +495,7 @@ 39.22 guarantee(klass->is_cloneable(), "all arrays are cloneable"); 39.23 } else { 39.24 guarantee(obj->is_instance(), "should be instanceOop"); 39.25 - bool cloneable = klass->is_subtype_of(SystemDictionary::cloneable_klass()); 39.26 + bool cloneable = klass->is_subtype_of(SystemDictionary::Cloneable_klass()); 39.27 guarantee(cloneable == klass->is_cloneable(), "incorrect cloneable flag"); 39.28 } 39.29 #endif 39.30 @@ -908,7 +908,7 @@ 39.31 // Special handling for primitive objects 39.32 if (java_lang_Class::is_primitive(mirror)) { 39.33 // Primitive objects does not have any interfaces 39.34 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::class_klass(), 0, CHECK_NULL); 39.35 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_NULL); 39.36 return (jobjectArray) JNIHandles::make_local(env, r); 39.37 } 39.38 39.39 @@ -923,7 +923,7 @@ 39.40 } 39.41 39.42 // Allocate result array 39.43 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::class_klass(), size, CHECK_NULL); 39.44 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::Class_klass(), size, CHECK_NULL); 39.45 objArrayHandle result (THREAD, r); 39.46 // Fill in result 39.47 if (klass->oop_is_instance()) { 39.48 @@ -934,8 +934,8 @@ 39.49 } 39.50 } else { 39.51 // All arrays implement java.lang.Cloneable and java.io.Serializable 39.52 - result->obj_at_put(0, Klass::cast(SystemDictionary::cloneable_klass())->java_mirror()); 39.53 - result->obj_at_put(1, Klass::cast(SystemDictionary::serializable_klass())->java_mirror()); 39.54 + result->obj_at_put(0, Klass::cast(SystemDictionary::Cloneable_klass())->java_mirror()); 39.55 + result->obj_at_put(1, Klass::cast(SystemDictionary::Serializable_klass())->java_mirror()); 39.56 } 39.57 return (jobjectArray) JNIHandles::make_local(env, result()); 39.58 JVM_END 39.59 @@ -1098,8 +1098,8 @@ 39.60 pending_exception = Handle(THREAD, PENDING_EXCEPTION); 39.61 CLEAR_PENDING_EXCEPTION; 39.62 39.63 - if ( pending_exception->is_a(SystemDictionary::exception_klass()) && 39.64 - !pending_exception->is_a(SystemDictionary::runtime_exception_klass())) { 39.65 + if ( pending_exception->is_a(SystemDictionary::Exception_klass()) && 39.66 + !pending_exception->is_a(SystemDictionary::RuntimeException_klass())) { 39.67 // Throw a java.security.PrivilegedActionException(Exception e) exception 39.68 JavaCallArguments args(pending_exception); 39.69 THROW_ARG_0(vmSymbolHandles::java_security_PrivilegedActionException(), 39.70 @@ -1190,7 +1190,7 @@ 39.71 39.72 // the resource area must be registered in case of a gc 39.73 RegisterArrayForGC ragc(thread, local_array); 39.74 - objArrayOop context = oopFactory::new_objArray(SystemDictionary::protectionDomain_klass(), 39.75 + objArrayOop context = oopFactory::new_objArray(SystemDictionary::ProtectionDomain_klass(), 39.76 local_array->length(), CHECK_NULL); 39.77 objArrayHandle h_context(thread, context); 39.78 for (int index = 0; index < local_array->length(); index++) { 39.79 @@ -1251,7 +1251,7 @@ 39.80 39.81 if (java_lang_Class::is_primitive(JNIHandles::resolve_non_null(ofClass)) || 39.82 ! Klass::cast(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)))->oop_is_instance()) { 39.83 - oop result = oopFactory::new_objArray(SystemDictionary::class_klass(), 0, CHECK_NULL); 39.84 + oop result = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_NULL); 39.85 return (jobjectArray)JNIHandles::make_local(env, result); 39.86 } 39.87 39.88 @@ -1259,7 +1259,7 @@ 39.89 39.90 if (k->inner_classes()->length() == 0) { 39.91 // Neither an inner nor outer class 39.92 - oop result = oopFactory::new_objArray(SystemDictionary::class_klass(), 0, CHECK_NULL); 39.93 + oop result = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_NULL); 39.94 return (jobjectArray)JNIHandles::make_local(env, result); 39.95 } 39.96 39.97 @@ -1269,7 +1269,7 @@ 39.98 int length = icls->length(); 39.99 39.100 // Allocate temp. result array 39.101 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::class_klass(), length/4, CHECK_NULL); 39.102 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::Class_klass(), length/4, CHECK_NULL); 39.103 objArrayHandle result (THREAD, r); 39.104 int members = 0; 39.105 39.106 @@ -1299,7 +1299,7 @@ 39.107 39.108 if (members != length) { 39.109 // Return array of right length 39.110 - objArrayOop res = oopFactory::new_objArray(SystemDictionary::class_klass(), members, CHECK_NULL); 39.111 + objArrayOop res = oopFactory::new_objArray(SystemDictionary::Class_klass(), members, CHECK_NULL); 39.112 for(int i = 0; i < members; i++) { 39.113 res->obj_at_put(i, result->obj_at(i)); 39.114 } 39.115 @@ -1473,11 +1473,11 @@ 39.116 oop mirror = NULL; 39.117 int slot = 0; 39.118 39.119 - if (reflected->klass() == SystemDictionary::reflect_constructor_klass()) { 39.120 + if (reflected->klass() == SystemDictionary::reflect_Constructor_klass()) { 39.121 mirror = java_lang_reflect_Constructor::clazz(reflected); 39.122 slot = java_lang_reflect_Constructor::slot(reflected); 39.123 } else { 39.124 - assert(reflected->klass() == SystemDictionary::reflect_method_klass(), 39.125 + assert(reflected->klass() == SystemDictionary::reflect_Method_klass(), 39.126 "wrong type"); 39.127 mirror = java_lang_reflect_Method::clazz(reflected); 39.128 slot = java_lang_reflect_Method::slot(reflected); 39.129 @@ -1533,7 +1533,7 @@ 39.130 if (java_lang_Class::is_primitive(JNIHandles::resolve_non_null(ofClass)) || 39.131 Klass::cast(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)))->oop_is_javaArray()) { 39.132 // Return empty array 39.133 - oop res = oopFactory::new_objArray(SystemDictionary::reflect_field_klass(), 0, CHECK_NULL); 39.134 + oop res = oopFactory::new_objArray(SystemDictionary::reflect_Field_klass(), 0, CHECK_NULL); 39.135 return (jobjectArray) JNIHandles::make_local(env, res); 39.136 } 39.137 39.138 @@ -1561,13 +1561,13 @@ 39.139 } else { 39.140 num_fields = fields_len / instanceKlass::next_offset; 39.141 39.142 - if (k() == SystemDictionary::throwable_klass()) { 39.143 + if (k() == SystemDictionary::Throwable_klass()) { 39.144 num_fields--; 39.145 skip_backtrace = true; 39.146 } 39.147 } 39.148 39.149 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_field_klass(), num_fields, CHECK_NULL); 39.150 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_Field_klass(), num_fields, CHECK_NULL); 39.151 objArrayHandle result (THREAD, r); 39.152 39.153 int out_idx = 0; 39.154 @@ -1601,7 +1601,7 @@ 39.155 if (java_lang_Class::is_primitive(JNIHandles::resolve_non_null(ofClass)) 39.156 || Klass::cast(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)))->oop_is_javaArray()) { 39.157 // Return empty array 39.158 - oop res = oopFactory::new_objArray(SystemDictionary::reflect_method_klass(), 0, CHECK_NULL); 39.159 + oop res = oopFactory::new_objArray(SystemDictionary::reflect_Method_klass(), 0, CHECK_NULL); 39.160 return (jobjectArray) JNIHandles::make_local(env, res); 39.161 } 39.162 39.163 @@ -1625,7 +1625,7 @@ 39.164 } 39.165 39.166 // Allocate result 39.167 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_method_klass(), num_methods, CHECK_NULL); 39.168 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_Method_klass(), num_methods, CHECK_NULL); 39.169 objArrayHandle result (THREAD, r); 39.170 39.171 int out_idx = 0; 39.172 @@ -1653,7 +1653,7 @@ 39.173 if (java_lang_Class::is_primitive(JNIHandles::resolve_non_null(ofClass)) 39.174 || Klass::cast(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)))->oop_is_javaArray()) { 39.175 // Return empty array 39.176 - oop res = oopFactory::new_objArray(SystemDictionary::reflect_constructor_klass(), 0 , CHECK_NULL); 39.177 + oop res = oopFactory::new_objArray(SystemDictionary::reflect_Constructor_klass(), 0 , CHECK_NULL); 39.178 return (jobjectArray) JNIHandles::make_local(env, res); 39.179 } 39.180 39.181 @@ -1677,7 +1677,7 @@ 39.182 } 39.183 39.184 // Allocate result 39.185 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_constructor_klass(), num_constructors, CHECK_NULL); 39.186 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_Constructor_klass(), num_constructors, CHECK_NULL); 39.187 objArrayHandle result(THREAD, r); 39.188 39.189 int out_idx = 0; 39.190 @@ -1890,7 +1890,7 @@ 39.191 symbolHandle klass_name (THREAD, cp->klass_name_at(klass_ref)); 39.192 symbolHandle member_name(THREAD, cp->uncached_name_ref_at(index)); 39.193 symbolHandle member_sig (THREAD, cp->uncached_signature_ref_at(index)); 39.194 - objArrayOop dest_o = oopFactory::new_objArray(SystemDictionary::string_klass(), 3, CHECK_NULL); 39.195 + objArrayOop dest_o = oopFactory::new_objArray(SystemDictionary::String_klass(), 3, CHECK_NULL); 39.196 objArrayHandle dest(THREAD, dest_o); 39.197 Handle str = java_lang_String::create_from_symbol(klass_name, CHECK_NULL); 39.198 dest->obj_at_put(0, str()); 39.199 @@ -2578,7 +2578,7 @@ 39.200 JavaValue result(T_VOID); 39.201 JavaCalls::call_virtual(&result, 39.202 obj, 39.203 - KlassHandle(THREAD, SystemDictionary::thread_klass()), 39.204 + KlassHandle(THREAD, SystemDictionary::Thread_klass()), 39.205 vmSymbolHandles::run_method_name(), 39.206 vmSymbolHandles::void_method_signature(), 39.207 THREAD); 39.208 @@ -2676,7 +2676,7 @@ 39.209 // Fix for 4314342, 4145910, perhaps others: it now doesn't have 39.210 // any effect on the "liveness" of a thread; see 39.211 // JVM_IsThreadAlive, below. 39.212 - if (java_throwable->is_a(SystemDictionary::threaddeath_klass())) { 39.213 + if (java_throwable->is_a(SystemDictionary::ThreadDeath_klass())) { 39.214 java_lang_Thread::set_stillborn(java_thread); 39.215 } 39.216 THROW_OOP(java_throwable); 39.217 @@ -3031,7 +3031,7 @@ 39.218 } 39.219 39.220 // Create result array of type [Ljava/lang/Class; 39.221 - objArrayOop result = oopFactory::new_objArray(SystemDictionary::class_klass(), depth, CHECK_NULL); 39.222 + objArrayOop result = oopFactory::new_objArray(SystemDictionary::Class_klass(), depth, CHECK_NULL); 39.223 // Fill in mirrors corresponding to method holders 39.224 int index = 0; 39.225 while (first != NULL) { 39.226 @@ -4327,7 +4327,7 @@ 39.227 JvmtiVMObjectAllocEventCollector oam; 39.228 39.229 int num_threads = tle.num_threads(); 39.230 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::thread_klass(), num_threads, CHECK_NULL); 39.231 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::Thread_klass(), num_threads, CHECK_NULL); 39.232 objArrayHandle threads_ah(THREAD, r); 39.233 39.234 for (int i = 0; i < num_threads; i++) { 39.235 @@ -4361,7 +4361,7 @@ 39.236 39.237 // check if threads is not an array of objects of Thread class 39.238 klassOop k = objArrayKlass::cast(ah->klass())->element_klass(); 39.239 - if (k != SystemDictionary::thread_klass()) { 39.240 + if (k != SystemDictionary::Thread_klass()) { 39.241 THROW_(vmSymbols::java_lang_IllegalArgumentException(), 0); 39.242 } 39.243 39.244 @@ -4421,7 +4421,7 @@ 39.245 if (encl_method_class_idx == 0) { 39.246 return NULL; 39.247 } 39.248 - objArrayOop dest_o = oopFactory::new_objArray(SystemDictionary::object_klass(), 3, CHECK_NULL); 39.249 + objArrayOop dest_o = oopFactory::new_objArray(SystemDictionary::Object_klass(), 3, CHECK_NULL); 39.250 objArrayHandle dest(THREAD, dest_o); 39.251 klassOop enc_k = ik_h->constants()->klass_at(encl_method_class_idx, CHECK_NULL); 39.252 dest->obj_at_put(0, Klass::cast(enc_k)->java_mirror()); 39.253 @@ -4535,7 +4535,7 @@ 39.254 values_h->int_at(0) == java_lang_Thread::NEW, 39.255 "Invalid threadStatus value"); 39.256 39.257 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(), 39.258 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(), 39.259 1, /* only 1 substate */ 39.260 CHECK_NULL); 39.261 names_h = objArrayHandle(THREAD, r); 39.262 @@ -4548,7 +4548,7 @@ 39.263 values_h->int_at(0) == java_lang_Thread::RUNNABLE, 39.264 "Invalid threadStatus value"); 39.265 39.266 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(), 39.267 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(), 39.268 1, /* only 1 substate */ 39.269 CHECK_NULL); 39.270 names_h = objArrayHandle(THREAD, r); 39.271 @@ -4561,7 +4561,7 @@ 39.272 values_h->int_at(0) == java_lang_Thread::BLOCKED_ON_MONITOR_ENTER, 39.273 "Invalid threadStatus value"); 39.274 39.275 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(), 39.276 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(), 39.277 1, /* only 1 substate */ 39.278 CHECK_NULL); 39.279 names_h = objArrayHandle(THREAD, r); 39.280 @@ -4574,7 +4574,7 @@ 39.281 values_h->int_at(0) == java_lang_Thread::IN_OBJECT_WAIT && 39.282 values_h->int_at(1) == java_lang_Thread::PARKED, 39.283 "Invalid threadStatus value"); 39.284 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(), 39.285 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(), 39.286 2, /* number of substates */ 39.287 CHECK_NULL); 39.288 names_h = objArrayHandle(THREAD, r); 39.289 @@ -4592,7 +4592,7 @@ 39.290 values_h->int_at(1) == java_lang_Thread::IN_OBJECT_WAIT_TIMED && 39.291 values_h->int_at(2) == java_lang_Thread::PARKED_TIMED, 39.292 "Invalid threadStatus value"); 39.293 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(), 39.294 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(), 39.295 3, /* number of substates */ 39.296 CHECK_NULL); 39.297 names_h = objArrayHandle(THREAD, r); 39.298 @@ -4611,7 +4611,7 @@ 39.299 assert(values_h->length() == 1 && 39.300 values_h->int_at(0) == java_lang_Thread::TERMINATED, 39.301 "Invalid threadStatus value"); 39.302 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(), 39.303 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(), 39.304 1, /* only 1 substate */ 39.305 CHECK_NULL); 39.306 names_h = objArrayHandle(THREAD, r); 39.307 @@ -4646,4 +4646,3 @@ 39.308 #endif // KERNEL 39.309 } 39.310 JVM_END 39.311 -
40.1 --- a/src/share/vm/prims/jvmtiEnter.xsl Tue Jan 05 11:16:09 2010 -0800 40.2 +++ b/src/share/vm/prims/jvmtiEnter.xsl Wed Jan 06 14:22:39 2010 -0800 40.3 @@ -773,7 +773,7 @@ 40.4 </xsl:apply-templates> 40.5 <xsl:text> 40.6 } 40.7 - if (!thread_oop->is_a(SystemDictionary::thread_klass())) { 40.8 + if (!thread_oop->is_a(SystemDictionary::Thread_klass())) { 40.9 </xsl:text> 40.10 <xsl:apply-templates select=".." mode="traceError"> 40.11 <xsl:with-param name="err">JVMTI_ERROR_INVALID_THREAD</xsl:with-param> 40.12 @@ -857,7 +857,7 @@ 40.13 </xsl:apply-templates> 40.14 <xsl:text> 40.15 } 40.16 - if (!k_mirror->is_a(SystemDictionary::class_klass())) { 40.17 + if (!k_mirror->is_a(SystemDictionary::Class_klass())) { 40.18 </xsl:text> 40.19 <xsl:apply-templates select=".." mode="traceError"> 40.20 <xsl:with-param name="err">JVMTI_ERROR_INVALID_CLASS</xsl:with-param>
41.1 --- a/src/share/vm/prims/jvmtiEnv.cpp Tue Jan 05 11:16:09 2010 -0800 41.2 +++ b/src/share/vm/prims/jvmtiEnv.cpp Wed Jan 06 14:22:39 2010 -0800 41.3 @@ -133,7 +133,7 @@ 41.4 if (thread_oop == NULL) { 41.5 return JVMTI_ERROR_INVALID_THREAD; 41.6 } 41.7 - if (!thread_oop->is_a(SystemDictionary::thread_klass())) { 41.8 + if (!thread_oop->is_a(SystemDictionary::Thread_klass())) { 41.9 return JVMTI_ERROR_INVALID_THREAD; 41.10 } 41.11 JavaThread* java_thread = java_lang_Thread::thread(thread_oop); 41.12 @@ -199,7 +199,7 @@ 41.13 if (k_mirror == NULL) { 41.14 return JVMTI_ERROR_INVALID_CLASS; 41.15 } 41.16 - if (!k_mirror->is_a(SystemDictionary::class_klass())) { 41.17 + if (!k_mirror->is_a(SystemDictionary::Class_klass())) { 41.18 return JVMTI_ERROR_INVALID_CLASS; 41.19 } 41.20 41.21 @@ -266,7 +266,7 @@ 41.22 oop mirror = JNIHandles::resolve_external_guard(object); 41.23 NULL_CHECK(mirror, JVMTI_ERROR_INVALID_OBJECT); 41.24 41.25 - if (mirror->klass() == SystemDictionary::class_klass()) { 41.26 + if (mirror->klass() == SystemDictionary::Class_klass()) { 41.27 if (!java_lang_Class::is_primitive(mirror)) { 41.28 mirror = java_lang_Class::as_klassOop(mirror); 41.29 assert(mirror != NULL, "class for non-primitive mirror must exist"); 41.30 @@ -327,7 +327,7 @@ 41.31 if (thread_oop == NULL) { 41.32 return JVMTI_ERROR_INVALID_THREAD; 41.33 } 41.34 - if (!thread_oop->is_a(SystemDictionary::thread_klass())) { 41.35 + if (!thread_oop->is_a(SystemDictionary::Thread_klass())) { 41.36 return JVMTI_ERROR_INVALID_THREAD; 41.37 } 41.38 java_thread = java_lang_Thread::thread(thread_oop); 41.39 @@ -620,7 +620,7 @@ 41.40 thread_oop = JNIHandles::resolve_external_guard(thread); 41.41 } 41.42 41.43 - if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::thread_klass())) { 41.44 + if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::Thread_klass())) { 41.45 return JVMTI_ERROR_INVALID_THREAD; 41.46 } 41.47 41.48 @@ -858,7 +858,7 @@ 41.49 jvmtiError 41.50 JvmtiEnv::InterruptThread(jthread thread) { 41.51 oop thread_oop = JNIHandles::resolve_external_guard(thread); 41.52 - if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::thread_klass())) 41.53 + if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::Thread_klass())) 41.54 return JVMTI_ERROR_INVALID_THREAD; 41.55 41.56 JavaThread* current_thread = JavaThread::current(); 41.57 @@ -895,7 +895,7 @@ 41.58 } else { 41.59 thread_oop = JNIHandles::resolve_external_guard(thread); 41.60 } 41.61 - if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::thread_klass())) 41.62 + if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::Thread_klass())) 41.63 return JVMTI_ERROR_INVALID_THREAD; 41.64 41.65 Handle thread_obj(current_thread, thread_oop); 41.66 @@ -1061,7 +1061,7 @@ 41.67 jvmtiError 41.68 JvmtiEnv::RunAgentThread(jthread thread, jvmtiStartFunction proc, const void* arg, jint priority) { 41.69 oop thread_oop = JNIHandles::resolve_external_guard(thread); 41.70 - if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::thread_klass())) { 41.71 + if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::Thread_klass())) { 41.72 return JVMTI_ERROR_INVALID_THREAD; 41.73 } 41.74 if (priority < JVMTI_THREAD_MIN_PRIORITY || priority > JVMTI_THREAD_MAX_PRIORITY) {
42.1 --- a/src/share/vm/prims/jvmtiEnvBase.cpp Tue Jan 05 11:16:09 2010 -0800 42.2 +++ b/src/share/vm/prims/jvmtiEnvBase.cpp Wed Jan 06 14:22:39 2010 -0800 42.3 @@ -508,7 +508,7 @@ 42.4 JavaThread * 42.5 JvmtiEnvBase::get_JavaThread(jthread jni_thread) { 42.6 oop t = JNIHandles::resolve_external_guard(jni_thread); 42.7 - if (t == NULL || !t->is_a(SystemDictionary::thread_klass())) { 42.8 + if (t == NULL || !t->is_a(SystemDictionary::Thread_klass())) { 42.9 return NULL; 42.10 } 42.11 // The following returns NULL if the thread has not yet run or is in 42.12 @@ -1250,7 +1250,7 @@ 42.13 for (int i = 0; i < _thread_count; ++i) { 42.14 jthread jt = _thread_list[i]; 42.15 oop thread_oop = JNIHandles::resolve_external_guard(jt); 42.16 - if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::thread_klass())) { 42.17 + if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::Thread_klass())) { 42.18 set_result(JVMTI_ERROR_INVALID_THREAD); 42.19 return; 42.20 }
43.1 --- a/src/share/vm/prims/jvmtiExport.cpp Tue Jan 05 11:16:09 2010 -0800 43.2 +++ b/src/share/vm/prims/jvmtiExport.cpp Wed Jan 06 14:22:39 2010 -0800 43.3 @@ -627,7 +627,7 @@ 43.4 klassOop k = obj->klass(); 43.5 43.6 // if the object is a java.lang.Class then return the java mirror 43.7 - if (k == SystemDictionary::class_klass()) { 43.8 + if (k == SystemDictionary::Class_klass()) { 43.9 if (!java_lang_Class::is_primitive(obj)) { 43.10 k = java_lang_Class::as_klassOop(obj); 43.11 assert(k != NULL, "class for non-primitive mirror must exist"); 43.12 @@ -1896,7 +1896,7 @@ 43.13 if (collector != NULL && collector->is_enabled()) { 43.14 // Don't record classes as these will be notified via the ClassLoad 43.15 // event. 43.16 - if (obj->klass() != SystemDictionary::class_klass()) { 43.17 + if (obj->klass() != SystemDictionary::Class_klass()) { 43.18 collector->record_allocation(obj); 43.19 } 43.20 }
44.1 --- a/src/share/vm/prims/jvmtiRedefineClasses.cpp Tue Jan 05 11:16:09 2010 -0800 44.2 +++ b/src/share/vm/prims/jvmtiRedefineClasses.cpp Wed Jan 06 14:22:39 2010 -0800 44.3 @@ -3214,7 +3214,7 @@ 44.4 // - all instanceKlasses for redefined classes reused & contents updated 44.5 the_class->vtable()->initialize_vtable(false, THREAD); 44.6 the_class->itable()->initialize_itable(false, THREAD); 44.7 - assert(!HAS_PENDING_EXCEPTION || (THREAD->pending_exception()->is_a(SystemDictionary::threaddeath_klass())), "redefine exception"); 44.8 + assert(!HAS_PENDING_EXCEPTION || (THREAD->pending_exception()->is_a(SystemDictionary::ThreadDeath_klass())), "redefine exception"); 44.9 } 44.10 44.11 // Leave arrays of jmethodIDs and itable index cache unchanged
45.1 --- a/src/share/vm/prims/jvmtiTagMap.cpp Tue Jan 05 11:16:09 2010 -0800 45.2 +++ b/src/share/vm/prims/jvmtiTagMap.cpp Wed Jan 06 14:22:39 2010 -0800 45.3 @@ -579,7 +579,7 @@ 45.4 // If the object is a java.lang.Class then return the klassOop, 45.5 // otherwise return the original object 45.6 static inline oop klassOop_if_java_lang_Class(oop o) { 45.7 - if (o->klass() == SystemDictionary::class_klass()) { 45.8 + if (o->klass() == SystemDictionary::Class_klass()) { 45.9 if (!java_lang_Class::is_primitive(o)) { 45.10 o = (oop)java_lang_Class::as_klassOop(o); 45.11 assert(o != NULL, "class for non-primitive mirror must exist"); 45.12 @@ -644,7 +644,7 @@ 45.13 } else { 45.14 // if the object represents a runtime class then use the 45.15 // tag for java.lang.Class 45.16 - _klass = SystemDictionary::class_klass(); 45.17 + _klass = SystemDictionary::Class_klass(); 45.18 } 45.19 _klass_tag = tag_for(tag_map, _klass); 45.20 } 45.21 @@ -747,7 +747,7 @@ 45.22 // get referrer class tag. 45.23 klassOop k = (_referrer == referrer) ? // Check if referrer is a class... 45.24 _referrer->klass() // No, just get its class 45.25 - : SystemDictionary::class_klass(); // Yes, its class is Class 45.26 + : SystemDictionary::Class_klass(); // Yes, its class is Class 45.27 _referrer_klass_tag = tag_for(tag_map, k); 45.28 } 45.29 } 45.30 @@ -1126,7 +1126,7 @@ 45.31 oop str, 45.32 void* user_data) 45.33 { 45.34 - assert(str->klass() == SystemDictionary::string_klass(), "not a string"); 45.35 + assert(str->klass() == SystemDictionary::String_klass(), "not a string"); 45.36 45.37 // get the string value and length 45.38 // (string value may be offset from the base) 45.39 @@ -1186,7 +1186,7 @@ 45.40 // for static fields only the index will be set 45.41 static jvmtiHeapReferenceInfo reference_info = { 0 }; 45.42 45.43 - assert(obj->klass() == SystemDictionary::class_klass(), "not a class"); 45.44 + assert(obj->klass() == SystemDictionary::Class_klass(), "not a class"); 45.45 if (java_lang_Class::is_primitive(obj)) { 45.46 return 0; 45.47 } 45.48 @@ -1498,7 +1498,7 @@ 45.49 if (callbacks()->primitive_field_callback != NULL && obj->is_instance()) { 45.50 jint res; 45.51 jvmtiPrimitiveFieldCallback cb = callbacks()->primitive_field_callback; 45.52 - if (obj->klass() == SystemDictionary::class_klass()) { 45.53 + if (obj->klass() == SystemDictionary::Class_klass()) { 45.54 res = invoke_primitive_field_callback_for_static_fields(&wrapper, 45.55 obj, 45.56 cb, 45.57 @@ -1515,7 +1515,7 @@ 45.58 // string callback 45.59 if (!is_array && 45.60 callbacks()->string_primitive_value_callback != NULL && 45.61 - obj->klass() == SystemDictionary::string_klass()) { 45.62 + obj->klass() == SystemDictionary::String_klass()) { 45.63 jint res = invoke_string_value_callback( 45.64 callbacks()->string_primitive_value_callback, 45.65 &wrapper, 45.66 @@ -2381,7 +2381,7 @@ 45.67 45.68 // invoke the string value callback 45.69 inline bool CallbackInvoker::report_string_value(oop str) { 45.70 - assert(str->klass() == SystemDictionary::string_klass(), "not a string"); 45.71 + assert(str->klass() == SystemDictionary::String_klass(), "not a string"); 45.72 45.73 AdvancedHeapWalkContext* context = advanced_context(); 45.74 assert(context->string_primitive_value_callback() != NULL, "no callback"); 45.75 @@ -2928,7 +2928,7 @@ 45.76 45.77 // super (only if something more interesting than java.lang.Object) 45.78 klassOop java_super = ik->java_super(); 45.79 - if (java_super != NULL && java_super != SystemDictionary::object_klass()) { 45.80 + if (java_super != NULL && java_super != SystemDictionary::Object_klass()) { 45.81 oop super = Klass::cast(java_super)->java_mirror(); 45.82 if (!CallbackInvoker::report_superclass_reference(mirror, super)) { 45.83 return false; 45.84 @@ -3070,7 +3070,7 @@ 45.85 45.86 // if the object is a java.lang.String 45.87 if (is_reporting_string_values() && 45.88 - o->klass() == SystemDictionary::string_klass()) { 45.89 + o->klass() == SystemDictionary::String_klass()) { 45.90 if (!CallbackInvoker::report_string_value(o)) { 45.91 return false; 45.92 } 45.93 @@ -3255,7 +3255,7 @@ 45.94 45.95 // instance 45.96 if (o->is_instance()) { 45.97 - if (o->klass() == SystemDictionary::class_klass()) { 45.98 + if (o->klass() == SystemDictionary::Class_klass()) { 45.99 o = klassOop_if_java_lang_Class(o); 45.100 if (o->is_klass()) { 45.101 // a java.lang.Class
46.1 --- a/src/share/vm/prims/methodHandleWalk.cpp Tue Jan 05 11:16:09 2010 -0800 46.2 +++ b/src/share/vm/prims/methodHandleWalk.cpp Wed Jan 06 14:22:39 2010 -0800 46.3 @@ -1045,7 +1045,7 @@ 46.4 case T_DOUBLE: emit_bc(Bytecodes::_dreturn); break; 46.5 case T_VOID: emit_bc(Bytecodes::_return); break; 46.6 case T_OBJECT: 46.7 - if (_rklass.not_null() && _rklass() != SystemDictionary::object_klass()) 46.8 + if (_rklass.not_null() && _rklass() != SystemDictionary::Object_klass()) 46.9 emit_bc(Bytecodes::_checkcast, cpool_klass_put(_rklass())); 46.10 emit_bc(Bytecodes::_areturn); 46.11 break;
47.1 --- a/src/share/vm/prims/methodHandles.cpp Tue Jan 05 11:16:09 2010 -0800 47.2 +++ b/src/share/vm/prims/methodHandles.cpp Wed Jan 06 14:22:39 2010 -0800 47.3 @@ -143,7 +143,7 @@ 47.4 return klassItable::method_for_itable_index((klassOop)vmtarget, vmindex); 47.5 } else { 47.6 if (!tk->oop_is_instance()) 47.7 - tk = instanceKlass::cast(SystemDictionary::object_klass()); 47.8 + tk = instanceKlass::cast(SystemDictionary::Object_klass()); 47.9 return ((instanceKlass*)tk)->method_at_vtable(vmindex); 47.10 } 47.11 } 47.12 @@ -264,14 +264,14 @@ 47.13 return decode_MemberName(x, receiver_limit_result, decode_flags_result); 47.14 } else if (java_dyn_MethodHandle::is_subclass(xk)) { 47.15 return decode_MethodHandle(x, receiver_limit_result, decode_flags_result); 47.16 - } else if (xk == SystemDictionary::reflect_method_klass()) { 47.17 + } else if (xk == SystemDictionary::reflect_Method_klass()) { 47.18 oop clazz = java_lang_reflect_Method::clazz(x); 47.19 int slot = java_lang_reflect_Method::slot(x); 47.20 klassOop k = java_lang_Class::as_klassOop(clazz); 47.21 if (k != NULL && Klass::cast(k)->oop_is_instance()) 47.22 return decode_methodOop(instanceKlass::cast(k)->method_with_idnum(slot), 47.23 decode_flags_result); 47.24 - } else if (xk == SystemDictionary::reflect_constructor_klass()) { 47.25 + } else if (xk == SystemDictionary::reflect_Constructor_klass()) { 47.26 oop clazz = java_lang_reflect_Constructor::clazz(x); 47.27 int slot = java_lang_reflect_Constructor::slot(x); 47.28 klassOop k = java_lang_Class::as_klassOop(clazz); 47.29 @@ -328,7 +328,7 @@ 47.30 }; 47.31 47.32 void MethodHandles::init_MemberName(oop mname_oop, oop target_oop) { 47.33 - if (target_oop->klass() == SystemDictionary::reflect_field_klass()) { 47.34 + if (target_oop->klass() == SystemDictionary::reflect_Field_klass()) { 47.35 oop clazz = java_lang_reflect_Field::clazz(target_oop); // fd.field_holder() 47.36 int slot = java_lang_reflect_Field::slot(target_oop); // fd.index() 47.37 int mods = java_lang_reflect_Field::modifiers(target_oop); 47.38 @@ -413,7 +413,7 @@ 47.39 if (defc_klassOop == NULL) return; // a primitive; no resolution possible 47.40 if (!Klass::cast(defc_klassOop)->oop_is_instance()) { 47.41 if (!Klass::cast(defc_klassOop)->oop_is_array()) return; 47.42 - defc_klassOop = SystemDictionary::object_klass(); 47.43 + defc_klassOop = SystemDictionary::Object_klass(); 47.44 } 47.45 instanceKlassHandle defc(THREAD, defc_klassOop); 47.46 defc_klassOop = NULL; // safety 47.47 @@ -749,7 +749,7 @@ 47.48 return NULL; // unformed MH 47.49 } 47.50 klassOop tklass = target->klass(); 47.51 - if (Klass::cast(tklass)->is_subclass_of(SystemDictionary::object_klass())) { 47.52 + if (Klass::cast(tklass)->is_subclass_of(SystemDictionary::Object_klass())) { 47.53 return target; // target is another MH (or something else?) 47.54 } 47.55 } 47.56 @@ -828,19 +828,19 @@ 47.57 } 47.58 47.59 bool MethodHandles::class_cast_needed(klassOop src, klassOop dst) { 47.60 - if (src == dst || dst == SystemDictionary::object_klass()) 47.61 + if (src == dst || dst == SystemDictionary::Object_klass()) 47.62 return false; // quickest checks 47.63 Klass* srck = Klass::cast(src); 47.64 Klass* dstk = Klass::cast(dst); 47.65 if (dstk->is_interface()) { 47.66 // interface receivers can safely be viewed as untyped, 47.67 // because interface calls always include a dynamic check 47.68 - //dstk = Klass::cast(SystemDictionary::object_klass()); 47.69 + //dstk = Klass::cast(SystemDictionary::Object_klass()); 47.70 return false; 47.71 } 47.72 if (srck->is_interface()) { 47.73 // interface arguments must be viewed as untyped 47.74 - //srck = Klass::cast(SystemDictionary::object_klass()); 47.75 + //srck = Klass::cast(SystemDictionary::Object_klass()); 47.76 return true; 47.77 } 47.78 if (is_always_null_type(src)) { 47.79 @@ -853,7 +853,7 @@ 47.80 } 47.81 47.82 static oop object_java_mirror() { 47.83 - return Klass::cast(SystemDictionary::object_klass())->java_mirror(); 47.84 + return Klass::cast(SystemDictionary::Object_klass())->java_mirror(); 47.85 } 47.86 47.87 bool MethodHandles::same_basic_type_for_arguments(BasicType src, 47.88 @@ -1449,7 +1449,7 @@ 47.89 break; 47.90 } 47.91 // check subrange of Integer.value, if necessary 47.92 - if (argument == NULL || argument->klass() != SystemDictionary::int_klass()) { 47.93 + if (argument == NULL || argument->klass() != SystemDictionary::Integer_klass()) { 47.94 err = "bound integer argument must be of type java.lang.Integer"; 47.95 break; 47.96 } 47.97 @@ -1472,7 +1472,7 @@ 47.98 BasicType argbox = java_lang_boxing_object::basic_type(argument); 47.99 if (argbox != ptype) { 47.100 err = check_argument_type_change(T_OBJECT, (argument == NULL 47.101 - ? SystemDictionary::object_klass() 47.102 + ? SystemDictionary::Object_klass() 47.103 : argument->klass()), 47.104 ptype, ptype_klass(), argnum); 47.105 assert(err != NULL, "this must be an error"); 47.106 @@ -2175,7 +2175,7 @@ 47.107 symbolOop name = vmSymbols::toString_name(), sig = vmSymbols::void_string_signature(); 47.108 JavaCallArguments args(Handle(THREAD, JNIHandles::resolve_non_null(erased_jh))); 47.109 JavaValue result(T_OBJECT); 47.110 - JavaCalls::call_virtual(&result, SystemDictionary::object_klass(), name, sig, 47.111 + JavaCalls::call_virtual(&result, SystemDictionary::Object_klass(), name, sig, 47.112 &args, CHECK); 47.113 Handle str(THREAD, (oop)result.get_jobject()); 47.114 java_lang_String::print(str, tty);
48.1 --- a/src/share/vm/prims/nativeLookup.cpp Tue Jan 05 11:16:09 2010 -0800 48.2 +++ b/src/share/vm/prims/nativeLookup.cpp Wed Jan 06 14:22:39 2010 -0800 48.3 @@ -137,7 +137,7 @@ 48.4 } 48.5 48.6 // Otherwise call static method findNative in ClassLoader 48.7 - KlassHandle klass (THREAD, SystemDictionary::classloader_klass()); 48.8 + KlassHandle klass (THREAD, SystemDictionary::ClassLoader_klass()); 48.9 Handle name_arg = java_lang_String::create_from_str(jni_name, CHECK_NULL); 48.10 48.11 JavaValue result(T_LONG);
49.1 --- a/src/share/vm/runtime/jniHandles.cpp Tue Jan 05 11:16:09 2010 -0800 49.2 +++ b/src/share/vm/runtime/jniHandles.cpp Wed Jan 06 14:22:39 2010 -0800 49.3 @@ -144,7 +144,7 @@ 49.4 EXCEPTION_MARK; 49.5 // We will never reach the CATCH below since Exceptions::_throw will cause 49.6 // the VM to exit if an exception is thrown during initialization 49.7 - klassOop k = SystemDictionary::object_klass(); 49.8 + klassOop k = SystemDictionary::Object_klass(); 49.9 _deleted_handle = instanceKlass::cast(k)->allocate_permanent_instance(CATCH); 49.10 } 49.11
50.1 --- a/src/share/vm/runtime/os.cpp Tue Jan 05 11:16:09 2010 -0800 50.2 +++ b/src/share/vm/runtime/os.cpp Wed Jan 06 14:22:39 2010 -0800 50.3 @@ -280,7 +280,7 @@ 50.4 string, 50.5 CHECK); 50.6 50.7 - KlassHandle group(THREAD, SystemDictionary::threadGroup_klass()); 50.8 + KlassHandle group(THREAD, SystemDictionary::ThreadGroup_klass()); 50.9 JavaCalls::call_special(&result, 50.10 thread_group, 50.11 group,
51.1 --- a/src/share/vm/runtime/reflection.cpp Tue Jan 05 11:16:09 2010 -0800 51.2 +++ b/src/share/vm/runtime/reflection.cpp Wed Jan 06 14:22:39 2010 -0800 51.3 @@ -449,7 +449,7 @@ 51.4 // sun/reflect/MagicAccessorImpl subclasses to succeed trivially. 51.5 if ( JDK_Version::is_gte_jdk14x_version() 51.6 && UseNewReflection 51.7 - && Klass::cast(current_class)->is_subclass_of(SystemDictionary::reflect_magic_klass())) { 51.8 + && Klass::cast(current_class)->is_subclass_of(SystemDictionary::reflect_MagicAccessorImpl_klass())) { 51.9 return true; 51.10 } 51.11 51.12 @@ -541,7 +541,7 @@ 51.13 // sun/reflect/MagicAccessorImpl subclasses to succeed trivially. 51.14 if ( JDK_Version::is_gte_jdk14x_version() 51.15 && UseNewReflection 51.16 - && Klass::cast(current_class)->is_subclass_of(SystemDictionary::reflect_magic_klass())) { 51.17 + && Klass::cast(current_class)->is_subclass_of(SystemDictionary::reflect_MagicAccessorImpl_klass())) { 51.18 return true; 51.19 } 51.20 51.21 @@ -631,7 +631,7 @@ 51.22 51.23 objArrayHandle Reflection::get_parameter_types(methodHandle method, int parameter_count, oop* return_type, TRAPS) { 51.24 // Allocate array holding parameter types (java.lang.Class instances) 51.25 - objArrayOop m = oopFactory::new_objArray(SystemDictionary::class_klass(), parameter_count, CHECK_(objArrayHandle())); 51.26 + objArrayOop m = oopFactory::new_objArray(SystemDictionary::Class_klass(), parameter_count, CHECK_(objArrayHandle())); 51.27 objArrayHandle mirrors (THREAD, m); 51.28 int index = 0; 51.29 // Collect parameter types 51.30 @@ -1308,7 +1308,7 @@ 51.31 if (Klass::cast(klass)->oop_is_array() && which == MEMBER_DECLARED) return NULL; 51.32 51.33 if (Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array()) { 51.34 - klass = SystemDictionary::object_klass(); 51.35 + klass = SystemDictionary::Object_klass(); 51.36 } 51.37 instanceKlassHandle h_k(THREAD, klass); 51.38 51.39 @@ -1375,13 +1375,13 @@ 51.40 // Exclude primitive types 51.41 if (java_lang_Class::is_primitive(mirror) || 51.42 (Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array() && (which == MEMBER_DECLARED))) { 51.43 - klassOop klass = SystemDictionary::reflect_method_klass(); 51.44 + klassOop klass = SystemDictionary::reflect_Method_klass(); 51.45 return oopFactory::new_objArray(klass, 0, CHECK_NULL); // Return empty array 51.46 } 51.47 51.48 klassOop klass = java_lang_Class::as_klassOop(mirror); 51.49 if (Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array()) { 51.50 - klass = SystemDictionary::object_klass(); 51.51 + klass = SystemDictionary::Object_klass(); 51.52 } 51.53 instanceKlassHandle h_k(THREAD, klass); 51.54 51.55 @@ -1411,7 +1411,7 @@ 51.56 } 51.57 51.58 // Allocate result 51.59 - klassOop klass = SystemDictionary::reflect_method_klass(); 51.60 + klassOop klass = SystemDictionary::reflect_Method_klass(); 51.61 objArrayOop r = oopFactory::new_objArray(klass, count, CHECK_NULL); 51.62 objArrayHandle h_result (THREAD, r); 51.63 51.64 @@ -1462,7 +1462,7 @@ 51.65 } 51.66 } 51.67 // Allocate result 51.68 - klassOop klass = SystemDictionary::reflect_method_klass(); 51.69 + klassOop klass = SystemDictionary::reflect_Method_klass(); 51.70 objArrayOop r = oopFactory::new_objArray(klass, count, CHECK_NULL); 51.71 objArrayHandle h_result (THREAD, r); 51.72 51.73 @@ -1523,7 +1523,7 @@ 51.74 bool prim = java_lang_Class::is_primitive(mirror); 51.75 Klass* k = prim ? NULL : Klass::cast(java_lang_Class::as_klassOop(mirror)); 51.76 if (prim || k->is_interface() || k->oop_is_array()) { 51.77 - return oopFactory::new_objArray(SystemDictionary::reflect_constructor_klass(), 0, CHECK_NULL); // Return empty array 51.78 + return oopFactory::new_objArray(SystemDictionary::reflect_Constructor_klass(), 0, CHECK_NULL); // Return empty array 51.79 } 51.80 51.81 // Must be instanceKlass at this point
52.1 --- a/src/share/vm/runtime/reflectionUtils.cpp Tue Jan 05 11:16:09 2010 -0800 52.2 +++ b/src/share/vm/runtime/reflectionUtils.cpp Wed Jan 06 14:22:39 2010 -0800 52.3 @@ -63,15 +63,15 @@ 52.4 void FilteredFieldsMap::initialize() { 52.5 int offset; 52.6 offset = java_lang_Throwable::get_backtrace_offset(); 52.7 - _filtered_fields->append(new FilteredField(SystemDictionary::throwable_klass(), offset)); 52.8 + _filtered_fields->append(new FilteredField(SystemDictionary::Throwable_klass(), offset)); 52.9 // The latest version of vm may be used with old jdk. 52.10 if (JDK_Version::is_gte_jdk16x_version()) { 52.11 // The following class fields do not exist in 52.12 // previous version of jdk. 52.13 offset = sun_reflect_ConstantPool::cp_oop_offset(); 52.14 - _filtered_fields->append(new FilteredField(SystemDictionary::reflect_constant_pool_klass(), offset)); 52.15 + _filtered_fields->append(new FilteredField(SystemDictionary::reflect_ConstantPool_klass(), offset)); 52.16 offset = sun_reflect_UnsafeStaticFieldAccessorImpl::base_offset(); 52.17 - _filtered_fields->append(new FilteredField(SystemDictionary::reflect_unsafe_static_field_accessor_impl_klass(), offset)); 52.18 + _filtered_fields->append(new FilteredField(SystemDictionary::reflect_UnsafeStaticFieldAccessorImpl_klass(), offset)); 52.19 } 52.20 } 52.21
53.1 --- a/src/share/vm/runtime/sharedRuntime.cpp Tue Jan 05 11:16:09 2010 -0800 53.2 +++ b/src/share/vm/runtime/sharedRuntime.cpp Wed Jan 06 14:22:39 2010 -0800 53.3 @@ -860,7 +860,7 @@ 53.4 if (JvmtiExport::can_hotswap_or_post_breakpoint()) { 53.5 int retry_count = 0; 53.6 while (!HAS_PENDING_EXCEPTION && callee_method->is_old() && 53.7 - callee_method->method_holder() != SystemDictionary::object_klass()) { 53.8 + callee_method->method_holder() != SystemDictionary::Object_klass()) { 53.9 // If has a pending exception then there is no need to re-try to 53.10 // resolve this method. 53.11 // If the method has been redefined, we need to try again. 53.12 @@ -1538,7 +1538,7 @@ 53.13 oop SharedRuntime::wrong_method_type_is_for_single_argument(JavaThread* thr, 53.14 oopDesc* required) { 53.15 if (required == NULL) return NULL; 53.16 - if (required->klass() == SystemDictionary::class_klass()) 53.17 + if (required->klass() == SystemDictionary::Class_klass()) 53.18 return required; 53.19 if (required->is_klass()) 53.20 return Klass::cast(klassOop(required))->java_mirror();
54.1 --- a/src/share/vm/runtime/statSampler.cpp Tue Jan 05 11:16:09 2010 -0800 54.2 +++ b/src/share/vm/runtime/statSampler.cpp Wed Jan 06 14:22:39 2010 -0800 54.3 @@ -177,7 +177,7 @@ 54.4 54.5 // public static String getProperty(String key, String def); 54.6 JavaCalls::call_static(&result, 54.7 - KlassHandle(THREAD, SystemDictionary::system_klass()), 54.8 + KlassHandle(THREAD, SystemDictionary::System_klass()), 54.9 vmSymbolHandles::getProperty_name(), 54.10 vmSymbolHandles::string_string_signature(), 54.11 key_str,
55.1 --- a/src/share/vm/runtime/thread.cpp Tue Jan 05 11:16:09 2010 -0800 55.2 +++ b/src/share/vm/runtime/thread.cpp Wed Jan 06 14:22:39 2010 -0800 55.3 @@ -957,7 +957,7 @@ 55.4 return; 55.5 } 55.6 55.7 - KlassHandle group(this, SystemDictionary::threadGroup_klass()); 55.8 + KlassHandle group(this, SystemDictionary::ThreadGroup_klass()); 55.9 Handle threadObj(this, this->threadObj()); 55.10 55.11 JavaCalls::call_special(&result, 55.12 @@ -1451,7 +1451,7 @@ 55.13 // so call ThreadGroup.uncaughtException() 55.14 KlassHandle recvrKlass(THREAD, threadObj->klass()); 55.15 CallInfo callinfo; 55.16 - KlassHandle thread_klass(THREAD, SystemDictionary::thread_klass()); 55.17 + KlassHandle thread_klass(THREAD, SystemDictionary::Thread_klass()); 55.18 LinkResolver::resolve_virtual_call(callinfo, threadObj, recvrKlass, thread_klass, 55.19 vmSymbolHandles::dispatchUncaughtException_name(), 55.20 vmSymbolHandles::throwable_void_signature(), 55.21 @@ -1467,7 +1467,7 @@ 55.22 uncaught_exception, 55.23 THREAD); 55.24 } else { 55.25 - KlassHandle thread_group(THREAD, SystemDictionary::threadGroup_klass()); 55.26 + KlassHandle thread_group(THREAD, SystemDictionary::ThreadGroup_klass()); 55.27 JavaValue result(T_VOID); 55.28 JavaCalls::call_virtual(&result, 55.29 group, thread_group, 55.30 @@ -1488,7 +1488,7 @@ 55.31 while (java_lang_Thread::threadGroup(threadObj()) != NULL && (count-- > 0)) { 55.32 EXCEPTION_MARK; 55.33 JavaValue result(T_VOID); 55.34 - KlassHandle thread_klass(THREAD, SystemDictionary::thread_klass()); 55.35 + KlassHandle thread_klass(THREAD, SystemDictionary::Thread_klass()); 55.36 JavaCalls::call_virtual(&result, 55.37 threadObj, thread_klass, 55.38 vmSymbolHandles::exit_method_name(), 55.39 @@ -1726,7 +1726,7 @@ 55.40 // Check for pending async. exception 55.41 if (_pending_async_exception != NULL) { 55.42 // Only overwrite an already pending exception, if it is not a threadDeath. 55.43 - if (!has_pending_exception() || !pending_exception()->is_a(SystemDictionary::threaddeath_klass())) { 55.44 + if (!has_pending_exception() || !pending_exception()->is_a(SystemDictionary::ThreadDeath_klass())) { 55.45 55.46 // We cannot call Exceptions::_throw(...) here because we cannot block 55.47 set_pending_exception(_pending_async_exception, __FILE__, __LINE__); 55.48 @@ -1835,14 +1835,14 @@ 55.49 if (is_Compiler_thread()) return; 55.50 55.51 // This is a change from JDK 1.1, but JDK 1.2 will also do it: 55.52 - if (java_throwable->is_a(SystemDictionary::threaddeath_klass())) { 55.53 + if (java_throwable->is_a(SystemDictionary::ThreadDeath_klass())) { 55.54 java_lang_Thread::set_stillborn(threadObj()); 55.55 } 55.56 55.57 { 55.58 // Actually throw the Throwable against the target Thread - however 55.59 // only if there is no thread death exception installed already. 55.60 - if (_pending_async_exception == NULL || !_pending_async_exception->is_a(SystemDictionary::threaddeath_klass())) { 55.61 + if (_pending_async_exception == NULL || !_pending_async_exception->is_a(SystemDictionary::ThreadDeath_klass())) { 55.62 // If the topmost frame is a runtime stub, then we are calling into 55.63 // OptoRuntime from compiled code. Some runtime stubs (new, monitor_exit..) 55.64 // must deoptimize the caller before continuing, as the compiled exception handler table
56.1 --- a/src/share/vm/runtime/vframe.cpp Tue Jan 05 11:16:09 2010 -0800 56.2 +++ b/src/share/vm/runtime/vframe.cpp Wed Jan 06 14:22:39 2010 -0800 56.3 @@ -124,7 +124,7 @@ 56.4 static void print_locked_object_class_name(outputStream* st, Handle obj, const char* lock_state) { 56.5 if (obj.not_null()) { 56.6 st->print("\t- %s <" INTPTR_FORMAT "> ", lock_state, (address)obj()); 56.7 - if (obj->klass() == SystemDictionary::class_klass()) { 56.8 + if (obj->klass() == SystemDictionary::Class_klass()) { 56.9 klassOop target_klass = java_lang_Class::as_klassOop(obj()); 56.10 st->print_cr("(a java.lang.Class for %s)", instanceKlass::cast(target_klass)->external_name()); 56.11 } else { 56.12 @@ -430,7 +430,7 @@ 56.13 // This is Method.invoke() -- skip it 56.14 } else if (use_new_reflection && 56.15 Klass::cast(method()->method_holder()) 56.16 - ->is_subclass_of(SystemDictionary::reflect_method_accessor_klass())) { 56.17 + ->is_subclass_of(SystemDictionary::reflect_MethodAccessorImpl_klass())) { 56.18 // This is an auxilary frame -- skip it 56.19 } else { 56.20 // This is non-excluded frame, we need to count it against the depth 56.21 @@ -490,8 +490,8 @@ 56.22 void vframeStreamCommon::skip_reflection_related_frames() { 56.23 while (!at_end() && 56.24 (JDK_Version::is_gte_jdk14x_version() && UseNewReflection && 56.25 - (Klass::cast(method()->method_holder())->is_subclass_of(SystemDictionary::reflect_method_accessor_klass()) || 56.26 - Klass::cast(method()->method_holder())->is_subclass_of(SystemDictionary::reflect_constructor_accessor_klass())))) { 56.27 + (Klass::cast(method()->method_holder())->is_subclass_of(SystemDictionary::reflect_MethodAccessorImpl_klass()) || 56.28 + Klass::cast(method()->method_holder())->is_subclass_of(SystemDictionary::reflect_ConstructorAccessorImpl_klass())))) { 56.29 next(); 56.30 } 56.31 }
57.1 --- a/src/share/vm/runtime/vmStructs.cpp Tue Jan 05 11:16:09 2010 -0800 57.2 +++ b/src/share/vm/runtime/vmStructs.cpp Wed Jan 06 14:22:39 2010 -0800 57.3 @@ -455,40 +455,38 @@ 57.4 static_field(SystemDictionary, _shared_dictionary, Dictionary*) \ 57.5 static_field(SystemDictionary, _system_loader_lock_obj, oop) \ 57.6 static_field(SystemDictionary, _loader_constraints, LoaderConstraintTable*) \ 57.7 - static_field(SystemDictionary, WK_KLASS(object_klass), klassOop) \ 57.8 - static_field(SystemDictionary, WK_KLASS(string_klass), klassOop) \ 57.9 - static_field(SystemDictionary, WK_KLASS(class_klass), klassOop) \ 57.10 - static_field(SystemDictionary, WK_KLASS(cloneable_klass), klassOop) \ 57.11 - static_field(SystemDictionary, WK_KLASS(classloader_klass), klassOop) \ 57.12 - static_field(SystemDictionary, WK_KLASS(serializable_klass), klassOop) \ 57.13 - static_field(SystemDictionary, WK_KLASS(system_klass), klassOop) \ 57.14 - static_field(SystemDictionary, WK_KLASS(throwable_klass), klassOop) \ 57.15 - static_field(SystemDictionary, WK_KLASS(threaddeath_klass), klassOop) \ 57.16 - static_field(SystemDictionary, WK_KLASS(error_klass), klassOop) \ 57.17 - static_field(SystemDictionary, WK_KLASS(exception_klass), klassOop) \ 57.18 - static_field(SystemDictionary, WK_KLASS(runtime_exception_klass), klassOop) \ 57.19 - static_field(SystemDictionary, WK_KLASS(classNotFoundException_klass), klassOop) \ 57.20 - static_field(SystemDictionary, WK_KLASS(noClassDefFoundError_klass), klassOop) \ 57.21 - static_field(SystemDictionary, WK_KLASS(linkageError_klass), klassOop) \ 57.22 + static_field(SystemDictionary, WK_KLASS(Object_klass), klassOop) \ 57.23 + static_field(SystemDictionary, WK_KLASS(String_klass), klassOop) \ 57.24 + static_field(SystemDictionary, WK_KLASS(Class_klass), klassOop) \ 57.25 + static_field(SystemDictionary, WK_KLASS(Cloneable_klass), klassOop) \ 57.26 + static_field(SystemDictionary, WK_KLASS(ClassLoader_klass), klassOop) \ 57.27 + static_field(SystemDictionary, WK_KLASS(Serializable_klass), klassOop) \ 57.28 + static_field(SystemDictionary, WK_KLASS(System_klass), klassOop) \ 57.29 + static_field(SystemDictionary, WK_KLASS(Throwable_klass), klassOop) \ 57.30 + static_field(SystemDictionary, WK_KLASS(ThreadDeath_klass), klassOop) \ 57.31 + static_field(SystemDictionary, WK_KLASS(Error_klass), klassOop) \ 57.32 + static_field(SystemDictionary, WK_KLASS(Exception_klass), klassOop) \ 57.33 + static_field(SystemDictionary, WK_KLASS(RuntimeException_klass), klassOop) \ 57.34 + static_field(SystemDictionary, WK_KLASS(ClassNotFoundException_klass), klassOop) \ 57.35 + static_field(SystemDictionary, WK_KLASS(NoClassDefFoundError_klass), klassOop) \ 57.36 + static_field(SystemDictionary, WK_KLASS(LinkageError_klass), klassOop) \ 57.37 static_field(SystemDictionary, WK_KLASS(ClassCastException_klass), klassOop) \ 57.38 static_field(SystemDictionary, WK_KLASS(ArrayStoreException_klass), klassOop) \ 57.39 - static_field(SystemDictionary, WK_KLASS(virtualMachineError_klass), klassOop) \ 57.40 + static_field(SystemDictionary, WK_KLASS(VirtualMachineError_klass), klassOop) \ 57.41 static_field(SystemDictionary, WK_KLASS(OutOfMemoryError_klass), klassOop) \ 57.42 static_field(SystemDictionary, WK_KLASS(StackOverflowError_klass), klassOop) \ 57.43 - static_field(SystemDictionary, WK_KLASS(protectionDomain_klass), klassOop) \ 57.44 + static_field(SystemDictionary, WK_KLASS(ProtectionDomain_klass), klassOop) \ 57.45 static_field(SystemDictionary, WK_KLASS(AccessControlContext_klass), klassOop) \ 57.46 - static_field(SystemDictionary, WK_KLASS(reference_klass), klassOop) \ 57.47 - static_field(SystemDictionary, WK_KLASS(soft_reference_klass), klassOop) \ 57.48 - static_field(SystemDictionary, WK_KLASS(weak_reference_klass), klassOop) \ 57.49 - static_field(SystemDictionary, WK_KLASS(final_reference_klass), klassOop) \ 57.50 - static_field(SystemDictionary, WK_KLASS(phantom_reference_klass), klassOop) \ 57.51 - static_field(SystemDictionary, WK_KLASS(finalizer_klass), klassOop) \ 57.52 - static_field(SystemDictionary, WK_KLASS(thread_klass), klassOop) \ 57.53 - static_field(SystemDictionary, WK_KLASS(threadGroup_klass), klassOop) \ 57.54 - static_field(SystemDictionary, WK_KLASS(properties_klass), klassOop) \ 57.55 - static_field(SystemDictionary, WK_KLASS(stringBuffer_klass), klassOop) \ 57.56 - static_field(SystemDictionary, WK_KLASS(vector_klass), klassOop) \ 57.57 - static_field(SystemDictionary, WK_KLASS(hashtable_klass), klassOop) \ 57.58 + static_field(SystemDictionary, WK_KLASS(Reference_klass), klassOop) \ 57.59 + static_field(SystemDictionary, WK_KLASS(SoftReference_klass), klassOop) \ 57.60 + static_field(SystemDictionary, WK_KLASS(WeakReference_klass), klassOop) \ 57.61 + static_field(SystemDictionary, WK_KLASS(FinalReference_klass), klassOop) \ 57.62 + static_field(SystemDictionary, WK_KLASS(PhantomReference_klass), klassOop) \ 57.63 + static_field(SystemDictionary, WK_KLASS(Finalizer_klass), klassOop) \ 57.64 + static_field(SystemDictionary, WK_KLASS(Thread_klass), klassOop) \ 57.65 + static_field(SystemDictionary, WK_KLASS(ThreadGroup_klass), klassOop) \ 57.66 + static_field(SystemDictionary, WK_KLASS(Properties_klass), klassOop) \ 57.67 + static_field(SystemDictionary, WK_KLASS(StringBuffer_klass), klassOop) \ 57.68 static_field(SystemDictionary, _box_klasses[0], klassOop) \ 57.69 static_field(SystemDictionary, _java_system_loader, oop) \ 57.70 \
58.1 --- a/src/share/vm/services/attachListener.cpp Tue Jan 05 11:16:09 2010 -0800 58.2 +++ b/src/share/vm/services/attachListener.cpp Wed Jan 06 14:22:39 2010 -0800 58.3 @@ -437,7 +437,7 @@ 58.4 string, 58.5 CHECK); 58.6 58.7 - KlassHandle group(THREAD, SystemDictionary::threadGroup_klass()); 58.8 + KlassHandle group(THREAD, SystemDictionary::ThreadGroup_klass()); 58.9 JavaCalls::call_special(&result, 58.10 thread_group, 58.11 group,
59.1 --- a/src/share/vm/services/heapDumper.cpp Tue Jan 05 11:16:09 2010 -0800 59.2 +++ b/src/share/vm/services/heapDumper.cpp Wed Jan 06 14:22:39 2010 -0800 59.3 @@ -1274,7 +1274,7 @@ 59.4 if (o->is_klass()) return; 59.5 59.6 // skip classes as these emitted as HPROF_GC_CLASS_DUMP records 59.7 - if (o->klass() == SystemDictionary::class_klass()) { 59.8 + if (o->klass() == SystemDictionary::Class_klass()) { 59.9 if (!java_lang_Class::is_primitive(o)) { 59.10 return; 59.11 }
60.1 --- a/src/share/vm/services/lowMemoryDetector.cpp Tue Jan 05 11:16:09 2010 -0800 60.2 +++ b/src/share/vm/services/lowMemoryDetector.cpp Wed Jan 06 14:22:39 2010 -0800 60.3 @@ -32,7 +32,7 @@ 60.4 void LowMemoryDetector::initialize() { 60.5 EXCEPTION_MARK; 60.6 60.7 - instanceKlassHandle klass (THREAD, SystemDictionary::thread_klass()); 60.8 + instanceKlassHandle klass (THREAD, SystemDictionary::Thread_klass()); 60.9 instanceHandle thread_oop = klass->allocate_instance_handle(CHECK); 60.10 60.11 const char thread_name[] = "Low Memory Detector";
61.1 --- a/src/share/vm/services/management.cpp Tue Jan 05 11:16:09 2010 -0800 61.2 +++ b/src/share/vm/services/management.cpp Wed Jan 06 14:22:39 2010 -0800 61.3 @@ -491,7 +491,7 @@ 61.4 int num_flags = Arguments::num_jvm_flags(); 61.5 int num_args = Arguments::num_jvm_args(); 61.6 61.7 - instanceKlassHandle ik (THREAD, SystemDictionary::string_klass()); 61.8 + instanceKlassHandle ik (THREAD, SystemDictionary::String_klass()); 61.9 objArrayOop r = oopFactory::new_objArray(ik(), num_args + num_flags, CHECK_NULL); 61.10 objArrayHandle result_h(THREAD, r); 61.11 61.12 @@ -1321,7 +1321,7 @@ 61.13 LoadedClassesEnumerator lce(THREAD); // Pass current Thread as parameter 61.14 61.15 int num_classes = lce.num_loaded_classes(); 61.16 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::class_klass(), num_classes, CHECK_0); 61.17 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::Class_klass(), num_classes, CHECK_0); 61.18 objArrayHandle classes_ah(THREAD, r); 61.19 61.20 for (int i = 0; i < num_classes; i++) { 61.21 @@ -1481,7 +1481,7 @@ 61.22 // last flag entry is always NULL, so subtract 1 61.23 int nFlags = (int) Flag::numFlags - 1; 61.24 // allocate a temp array 61.25 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(), 61.26 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(), 61.27 nFlags, CHECK_0); 61.28 objArrayHandle flags_ah(THREAD, r); 61.29 int num_entries = 0; 61.30 @@ -1497,7 +1497,7 @@ 61.31 61.32 if (num_entries < nFlags) { 61.33 // Return array of right length 61.34 - objArrayOop res = oopFactory::new_objArray(SystemDictionary::string_klass(), num_entries, CHECK_0); 61.35 + objArrayOop res = oopFactory::new_objArray(SystemDictionary::String_klass(), num_entries, CHECK_0); 61.36 for(int i = 0; i < num_entries; i++) { 61.37 res->obj_at_put(i, flags_ah->obj_at(i)); 61.38 } 61.39 @@ -1593,7 +1593,7 @@ 61.40 objArrayHandle names_ah(THREAD, ta); 61.41 // Make sure we have a String array 61.42 klassOop element_klass = objArrayKlass::cast(names_ah->klass())->element_klass(); 61.43 - if (element_klass != SystemDictionary::string_klass()) { 61.44 + if (element_klass != SystemDictionary::String_klass()) { 61.45 THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(), 61.46 "Array element type is not String class", 0); 61.47 } 61.48 @@ -1747,7 +1747,7 @@ 61.49 61.50 // Make sure we have a String array 61.51 klassOop element_klass = objArrayKlass::cast(names_ah->klass())->element_klass(); 61.52 - if (element_klass != SystemDictionary::string_klass()) { 61.53 + if (element_klass != SystemDictionary::String_klass()) { 61.54 THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(), 61.55 "Array element type is not String class", 0); 61.56 } 61.57 @@ -1782,7 +1782,7 @@ 61.58 num_threads += cycle->num_threads(); 61.59 } 61.60 61.61 - objArrayOop r = oopFactory::new_objArray(SystemDictionary::thread_klass(), num_threads, CHECK_NH); 61.62 + objArrayOop r = oopFactory::new_objArray(SystemDictionary::Thread_klass(), num_threads, CHECK_NH); 61.63 objArrayHandle threads_ah(THREAD, r); 61.64 61.65 int index = 0;
62.1 --- a/src/share/vm/services/serviceUtil.hpp Tue Jan 05 11:16:09 2010 -0800 62.2 +++ b/src/share/vm/services/serviceUtil.hpp Wed Jan 06 14:22:39 2010 -0800 62.3 @@ -45,7 +45,7 @@ 62.4 // instance 62.5 if (o->is_instance()) { 62.6 // instance objects are visible 62.7 - if (o->klass() != SystemDictionary::class_klass()) { 62.8 + if (o->klass() != SystemDictionary::Class_klass()) { 62.9 return true; 62.10 } 62.11 if (java_lang_Class::is_primitive(o)) {
63.1 --- a/src/share/vm/services/threadService.cpp Tue Jan 05 11:16:09 2010 -0800 63.2 +++ b/src/share/vm/services/threadService.cpp Wed Jan 06 14:22:39 2010 -0800 63.3 @@ -540,7 +540,7 @@ 63.4 } 63.5 63.6 Handle ThreadStackTrace::allocate_fill_stack_trace_element_array(TRAPS) { 63.7 - klassOop k = SystemDictionary::stackTraceElement_klass(); 63.8 + klassOop k = SystemDictionary::StackTraceElement_klass(); 63.9 assert(k != NULL, "must be loaded in 1.4+"); 63.10 instanceKlassHandle ik(THREAD, k); 63.11
64.1 --- a/src/share/vm/utilities/exceptions.cpp Tue Jan 05 11:16:09 2010 -0800 64.2 +++ b/src/share/vm/utilities/exceptions.cpp Wed Jan 06 14:22:39 2010 -0800 64.3 @@ -122,7 +122,7 @@ 64.4 // Check for special boot-strapping/vm-thread handling 64.5 if (special_exception(thread, file, line, h_exception)) return; 64.6 64.7 - assert(h_exception->is_a(SystemDictionary::throwable_klass()), "exception is not a subclass of java/lang/Throwable"); 64.8 + assert(h_exception->is_a(SystemDictionary::Throwable_klass()), "exception is not a subclass of java/lang/Throwable"); 64.9 64.10 // set the pending exception 64.11 thread->set_pending_exception(h_exception(), file, line); 64.12 @@ -255,7 +255,7 @@ 64.13 64.14 // Future: object initializer should take a cause argument 64.15 if (h_cause() != NULL) { 64.16 - assert(h_cause->is_a(SystemDictionary::throwable_klass()), 64.17 + assert(h_cause->is_a(SystemDictionary::Throwable_klass()), 64.18 "exception cause is not a subclass of java/lang/Throwable"); 64.19 JavaValue result1(T_OBJECT); 64.20 JavaCallArguments args1;
