Use HostedSubstrateUtil for runtime classloader resolving

Author: ivan-ristovic

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

@@ -24,8 +24,6 @@
  */
 package com.oracle.svm.hosted;
 
-import static com.oracle.svm.core.util.VMError.shouldNotReachHereAtRuntime;
-
 import java.lang.module.Configuration;
 import java.lang.module.FindException;
 import java.lang.module.ModuleDescriptor;
@@ -56,7 +54,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jdk.internal.loader.ClassLoaders;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -73,6 +70,7 @@
 import com.oracle.svm.core.jdk.Resources;
 import com.oracle.svm.core.jdk.RuntimeClassLoaderValueSupport;
 import com.oracle.svm.core.jdk.RuntimeModuleSupport;
+import com.oracle.svm.core.util.HostedSubstrateUtil;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.FeatureImpl.AfterAnalysisAccessImpl;
 import com.oracle.svm.hosted.FeatureImpl.AnalysisAccessBase;
@@ -87,6 +85,8 @@
 import jdk.internal.module.ServicesCatalog;
 import jdk.internal.module.SystemModuleFinders;
 
+import static com.oracle.svm.core.util.VMError.shouldNotReachHereAtRuntime;
+
 /**
  * This feature:
  * <ul>
@@ -808,24 +808,12 @@ public ModuleFinder getAppModuleFinder() {
             }
         }
 
-        private ClassLoader getRuntimeLoaderFor(ClassLoader hostedLoader) {
-            /*
-             * Make sure to replace builder class loader with the application class loader. This is
-             * the case, for example, for library support modules.
-             */
-            if (hostedLoader == imageClassLoader.getClassLoader()) {
-                return ClassLoaders.appClassLoader();
-            } else {
-                return hostedLoader;
-            }
-        }
-
         public Module getRuntimeModuleForHostedModule(Module hostedModule, boolean optional) {
             return getRuntimeModuleForHostedModule(hostedModule.getClassLoader(), hostedModule.getName(), optional);
         }
 
         public Module getRuntimeModuleForHostedModule(ClassLoader hostedLoader, String hostedModuleName, boolean optional) {
-            ClassLoader loader = getRuntimeLoaderFor(hostedLoader);
+            ClassLoader loader = HostedSubstrateUtil.getRuntimeClassLoader(hostedLoader);
             Map<String, Module> loaderRuntimeModules = runtimeModules.get(loader);
             if (loaderRuntimeModules == null) {
                 if (optional) {
@@ -863,7 +851,7 @@ public Module getOrCreateRuntimeModuleForHostedModule(Module hostedModule, Analy
 
         public Module getOrCreateRuntimeModuleForHostedModule(ClassLoader hostedLoader, String hostedModuleName, ModuleDescriptor runtimeModuleDescriptor, AnalysisAccessBase access,
                         boolean enableNativeAccess) {
-            ClassLoader loader = getRuntimeLoaderFor(hostedLoader);
+            ClassLoader loader = HostedSubstrateUtil.getRuntimeClassLoader(hostedLoader);
             synchronized (runtimeModules) {
                 Module runtimeModule = getRuntimeModuleForHostedModule(loader, hostedModuleName, true);
                 if (runtimeModule != null) {