1.1 --- a/src/share/vm/oops/instanceKlass.cpp Thu Sep 06 07:28:30 2012 -0700
1.2 +++ b/src/share/vm/oops/instanceKlass.cpp Fri Sep 07 12:04:16 2012 -0400
1.3 @@ -191,14 +191,14 @@
1.4 InstanceKlass* ik;
1.5 if (rt == REF_NONE) {
1.6 if (name == vmSymbols::java_lang_Class()) {
1.7 - ik = new (loader_data, size, THREAD) instanceMirrorKlass(
1.8 + ik = new (loader_data, size, THREAD) InstanceMirrorKlass(
1.9 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt,
1.10 access_flags, !host_klass.is_null());
1.11 } else if (name == vmSymbols::java_lang_ClassLoader() ||
1.12 (SystemDictionary::ClassLoader_klass_loaded() &&
1.13 super_klass != NULL &&
1.14 super_klass->is_subtype_of(SystemDictionary::ClassLoader_klass()))) {
1.15 - ik = new (loader_data, size, THREAD) instanceClassLoaderKlass(
1.16 + ik = new (loader_data, size, THREAD) InstanceClassLoaderKlass(
1.17 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt,
1.18 access_flags, !host_klass.is_null());
1.19 } else {
1.20 @@ -209,7 +209,7 @@
1.21 }
1.22 } else {
1.23 // reference klass
1.24 - ik = new (loader_data, size, THREAD) instanceRefKlass(
1.25 + ik = new (loader_data, size, THREAD) InstanceRefKlass(
1.26 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt,
1.27 access_flags, !host_klass.is_null());
1.28 }
1.29 @@ -2284,7 +2284,7 @@
1.30 }
1.31
1.32 address InstanceKlass::static_field_addr(int offset) {
1.33 - return (address)(offset + instanceMirrorKlass::offset_of_static_fields() + (intptr_t)java_mirror());
1.34 + return (address)(offset + InstanceMirrorKlass::offset_of_static_fields() + (intptr_t)java_mirror());
1.35 }
1.36
1.37
1.38 @@ -3073,7 +3073,7 @@
1.39
1.40
1.41 void JNIid::verify(Klass* holder) {
1.42 - int first_field_offset = instanceMirrorKlass::offset_of_static_fields();
1.43 + int first_field_offset = InstanceMirrorKlass::offset_of_static_fields();
1.44 int end_field_offset;
1.45 end_field_offset = first_field_offset + (InstanceKlass::cast(holder)->static_field_size() * wordSize);
1.46
