8298470: Short cut java.lang.Object super class loading

Reviewed-by: dholmes, iklam
openjdk · Dec 19, 2022 · 4c927df · 4c927df · openjdk-notifier · Dec 19, 2022
1 parent 756a06d
commit 4c927df
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
@@ -5996,13 +5996,17 @@ void ClassFileParser::post_process_parsed_stream(const ClassFileStream* const st
         CHECK);
     }
     Handle loader(THREAD, _loader_data->class_loader());
-    _super_klass = (const InstanceKlass*)
+    if (loader.is_null() && super_class_name == vmSymbols::java_lang_Object()) {
+      _super_klass = vmClasses::Object_klass();
+    } else {
+      _super_klass = (const InstanceKlass*)
                        SystemDictionary::resolve_super_or_fail(_class_name,
                                                                super_class_name,
                                                                loader,
                                                                _protection_domain,
                                                                true,
                                                                CHECK);
+    }
   }
 
   if (_super_klass != NULL) {