8355556: JVM crash because archived method handle intrinsics are not restored

iklam · iklam · commit 366650a438d0 · 2025-06-13T16:11:49.000Z
Reviewed-by: adinn, vlivanov, shade
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
@@ -771,8 +771,8 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
 #endif
 
   if (CDSConfig::is_using_aot_linked_classes()) {
-    AOTLinkedClassBulkLoader::finish_loading_javabase_classes(CHECK_JNI_ERR);
     SystemDictionary::restore_archived_method_handle_intrinsics();
+    AOTLinkedClassBulkLoader::finish_loading_javabase_classes(CHECK_JNI_ERR);
   }
 
   // Start string deduplication thread if requested.

Original file line number	Diff line number	Diff line change
`@@ -771,8 +771,8 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {`
`771`	`771`	`#endif`
`772`	`772`
`773`	`773`	`if (CDSConfig::is_using_aot_linked_classes()) {`
`774`		`- AOTLinkedClassBulkLoader::finish_loading_javabase_classes(CHECK_JNI_ERR);`
`775`	`774`	`SystemDictionary::restore_archived_method_handle_intrinsics();`
	`775`	`+ AOTLinkedClassBulkLoader::finish_loading_javabase_classes(CHECK_JNI_ERR);`
`776`	`776`	`}`
`777`	`777`
`778`	`778`	`// Start string deduplication thread if requested.`