jdk-sandbox: comparison hotspot/src/share/vm/oops/instanceKlass.cpp

equal deleted inserted replaced

-:aa8c9eb6d900
+:d67be49a5beb
 // Allocation
 InstanceKlass* ik;
 if (rt == REF_NONE) {
 if (name == vmSymbols::java_lang_Class()) {
-ik = new (loader_data, size, THREAD) instanceMirrorKlass(
+ik = new (loader_data, size, THREAD) InstanceMirrorKlass(
 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt,
 access_flags, !host_klass.is_null());
 } else if (name == vmSymbols::java_lang_ClassLoader() ||
 (SystemDictionary::ClassLoader_klass_loaded() &&
 super_klass != NULL &&
 super_klass->is_subtype_of(SystemDictionary::ClassLoader_klass()))) {
-ik = new (loader_data, size, THREAD) instanceClassLoaderKlass(
+ik = new (loader_data, size, THREAD) InstanceClassLoaderKlass(
 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt,
 access_flags, !host_klass.is_null());
 } else {
 // normal class
 ik = new (loader_data, size, THREAD) InstanceKlass(
 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt,
 access_flags, !host_klass.is_null());
 }
 } else {
 // reference klass
-ik = new (loader_data, size, THREAD) instanceRefKlass(
+ik = new (loader_data, size, THREAD) InstanceRefKlass(
 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt,
 access_flags, !host_klass.is_null());
 }
 return ik;
 _source_debug_extension = sde;
 }
 }
 address InstanceKlass::static_field_addr(int offset) {
-return (address)(offset + instanceMirrorKlass::offset_of_static_fields() + (intptr_t)java_mirror());
+return (address)(offset + InstanceMirrorKlass::offset_of_static_fields() + (intptr_t)java_mirror());
 }
 const char* InstanceKlass::signature_name() const {
 const char* src = (const char*) (name()->as_C_string());
 }
 }
 void JNIid::verify(Klass* holder) {
-int first_field_offset  = instanceMirrorKlass::offset_of_static_fields();
+int first_field_offset  = InstanceMirrorKlass::offset_of_static_fields();
 int end_field_offset;
 end_field_offset = first_field_offset + (InstanceKlass::cast(holder)->static_field_size() * wordSize);
 JNIid* current = this;
 while (current != NULL) {

changeset 13738	d67be49a5beb
parent 13736	5b15a8f57979
child 13952	e3cf184080bc