From a1ba9e28e3e4b2b359b24feae4f4406c5ceaf61a Mon Sep 17 00:00:00 2001
From: Calvin Cheung <calvin.cheung@oracle.com>
Date: Tue, 12 Nov 2024 22:04:10 +0000
Subject: [PATCH] 8343416: CDS dump fails when unregistered class can also be
 loaded from system modules

---
 src/hotspot/share/cds/unregisteredClasses.cpp |  6 +--
 .../customLoader/ClassFromSystemModule.java   | 53 +++++++++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassFromSystemModule.java

diff --git a/src/hotspot/share/cds/unregisteredClasses.cpp b/src/hotspot/share/cds/unregisteredClasses.cpp
index 91346a2008522..d23ca8903e9d6 100644
--- a/src/hotspot/share/cds/unregisteredClasses.cpp
+++ b/src/hotspot/share/cds/unregisteredClasses.cpp
@@ -51,6 +51,7 @@ InstanceKlass* UnregisteredClasses::load_class(Symbol* name, const char* path, T
                              PerfClassTraceTime::CLASS_LOAD);
 
   Symbol* path_symbol = SymbolTable::new_symbol(path);
+  Symbol* findClass = SymbolTable::new_symbol("findClass");
   Handle url_classloader = get_url_classloader(path_symbol, CHECK_NULL);
   Handle ext_class_name = java_lang_String::externalize_classname(name, CHECK_NULL);
 
@@ -58,11 +59,10 @@ InstanceKlass* UnregisteredClasses::load_class(Symbol* name, const char* path, T
   JavaCallArguments args(2);
   args.set_receiver(url_classloader);
   args.push_oop(ext_class_name);
-  args.push_int(JNI_FALSE);
   JavaCalls::call_virtual(&result,
                           vmClasses::URLClassLoader_klass(),
-                          vmSymbols::loadClass_name(),
-                          vmSymbols::string_boolean_class_signature(),
+                          findClass,
+                          vmSymbols::string_class_signature(),
                           &args,
                           CHECK_NULL);
   assert(result.get_type() == T_OBJECT, "just checking");
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassFromSystemModule.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassFromSystemModule.java
new file mode 100644
index 0000000000000..c50d6f3fab5f8
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassFromSystemModule.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 8343416
+ * @summary Test dumping of class from a system module loaded by a custom loader.
+ * @requires vm.cds
+ * @requires vm.cds.custom.loaders
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @run driver ClassFromSystemModule
+ */
+
+import java.nio.file.*;
+
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class ClassFromSystemModule {
+    public static void main(String[] args) throws Exception {
+        Path jrtFs = Paths.get(System.getProperty("java.home"), "lib", "jrt-fs.jar");
+        System.out.println("jrtFs: " + jrtFs.toString());
+
+        String classlist[] = new String[] {
+            "java/nio/file/spi/FileSystemProvider id: 1000",
+            "jdk/internal/jrtfs/JrtFileSystemProvider id: 1001 super:1000 source: " + jrtFs.toString(),
+        };
+
+        OutputAnalyzer out = TestCommon.testDump(null, classlist, "-Xlog:cds,cds+class=debug");
+        out.shouldContain("boot  java.nio.file.spi.FileSystemProvider")
+           .shouldContain("unreg jdk.internal.jrtfs.JrtFileSystemProvider");
+    }
+}