Remove package-private access to NativeImageClassLoaderSupport.classPathClassLoader

Author: olpaw

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderSupportImpl.java

@@ -58,35 +58,35 @@
 import com.oracle.svm.core.util.ClasspathUtils;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.hosted.NativeImageClassLoaderSupport.ClassPathClassLoader;
 import com.oracle.svm.util.ModuleSupport;
 
 class ClassLoaderSupportImpl extends ClassLoaderSupport {
 
     private final NativeImageClassLoaderSupport classLoaderSupport;
+
     private final ClassLoader imageClassLoader;
+    private final ClassPathClassLoader classPathClassLoader;
 
     private final Map<String, Set<Module>> packageToModules;
 
     ClassLoaderSupportImpl(NativeImageClassLoaderSupport classLoaderSupport) {
         this.classLoaderSupport = classLoaderSupport;
-        this.imageClassLoader = classLoaderSupport.getClassLoader();
+
+        imageClassLoader = classLoaderSupport.getClassLoader();
+        ClassLoader parent = imageClassLoader.getParent();
+        classPathClassLoader = parent instanceof ClassPathClassLoader ? (ClassPathClassLoader) parent : null;
+
         packageToModules = new HashMap<>();
         buildPackageToModulesMap(classLoaderSupport);
     }
 
     @Override
     protected boolean isNativeImageClassLoaderImpl(ClassLoader loader) {
         if (loader == imageClassLoader) {
-            /* Trivial case */
             return true;
         }
-        if (loader == classLoaderSupport.classPathClassLoader) {
-            /*
-             * If imageClassLoader is a module classloader (building image with non-empty
-             * NativeImageClassLoaderSupport.imagemp), the passed loader could also be our
-             * classLoaderSupport.classPathClassLoader (building image with non-empty
-             * NativeImageClassLoaderSupport.imagecp).
-             */
+        if (classPathClassLoader != null && loader == classPathClassLoader) {
             return true;
         }
         if (loader instanceof NativeImageSystemClassLoader) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java

@@ -95,8 +95,8 @@ public class NativeImageClassLoaderSupport {
     private final EconomicMap<URI, EconomicSet<String>> packages;
     private final EconomicSet<String> emptySet;
 
-    final URLClassLoader classPathClassLoader;
-    private final ClassLoader modulePathClassLoader;
+    private final ClassPathClassLoader classPathClassLoader;
+    private final ClassLoader classLoader;
 
     public final ModuleFinder upgradeAndSystemModuleFinder;
     public final ModuleLayer moduleLayerForImageBuild;
@@ -146,7 +146,7 @@ protected NativeImageClassLoaderSupport(ClassLoader defaultSystemClassLoader, St
         adjustBootLayerQualifiedExports(moduleLayer);
         moduleLayerForImageBuild = moduleLayer;
 
-        modulePathClassLoader = getSingleClassloader(moduleLayer);
+        classLoader = getSingleClassloader(moduleLayer);
 
         modulepathModuleFinder = ModuleFinder.of(modulepath().toArray(Path[]::new));
     }
@@ -160,7 +160,7 @@ List<Path> applicationClassPath() {
     }
 
     public ClassLoader getClassLoader() {
-        return modulePathClassLoader;
+        return classLoader;
     }
 
     public void initAllClasses(ForkJoinPool executor, ImageClassLoader imageClassLoader) {
@@ -507,7 +507,7 @@ private static UserError.UserException userErrorAddExportsAndOpensAndReads(Optio
     Class<?> loadClassFromModule(Object module, String className) {
         assert module instanceof Module : "Argument `module` is not an instance of java.lang.Module";
         Module m = (Module) module;
-        assert isModuleClassLoader(modulePathClassLoader, m.getClassLoader()) : "Argument `module` is java.lang.Module from unknown ClassLoader";
+        assert isModuleClassLoader(classLoader, m.getClassLoader()) : "Argument `module` is java.lang.Module from unknown ClassLoader";
         return Class.forName(m, className);
     }