Use version specific ClassLoaderSupportImpl classes instead of overlaying class ClassLoaderSupportFeature

Author: olpaw

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

@@ -59,7 +59,7 @@ public class NativeImageClassLoaderSupport extends AbstractNativeImageClassLoade
     private final List<Path> buildmp;
 
     private final ClassLoader classLoader;
-    final ModuleLayer moduleLayerForImageBuild;
+    public final ModuleLayer moduleLayerForImageBuild;
 
     NativeImageClassLoaderSupport(ClassLoader defaultSystemClassLoader, String[] classpath, String[] modulePath) {
         super(defaultSystemClassLoader, classpath);
@@ -244,7 +244,7 @@ Optional<String> getMainClassFromModule(Object module) {
     }
 
     @Override
-    ClassLoader getClassLoader() {
+    public ClassLoader getClassLoader() {
         return classLoader;
     }
 

substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ClassLoaderSupportFeature.java renamed to substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/ClassLoaderSupportImplJDK11OrLater.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.oracle.svm.hosted;
+package com.oracle.svm.hosted.jdk11;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -45,26 +45,18 @@
 
 import com.oracle.svm.core.ClassLoaderSupport;
 import com.oracle.svm.core.annotate.AutomaticFeature;
-import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.hosted.FeatureImpl;
+import com.oracle.svm.hosted.NativeImageClassLoaderSupport;
+import com.oracle.svm.hosted.NativeImageSystemClassLoader;
 
 import jdk.internal.module.Modules;
 
-@AutomaticFeature
-public class ClassLoaderSupportFeature implements Feature {
-    @Override
-    public void afterRegistration(AfterRegistrationAccess a) {
-        VMError.guarantee(JavaVersionUtil.JAVA_SPEC > 8);
-        FeatureImpl.AfterRegistrationAccessImpl access = (FeatureImpl.AfterRegistrationAccessImpl) a;
-        ImageSingletons.add(ClassLoaderSupport.class, new ClassLoaderSupportImpl11(access.getImageClassLoader().classLoaderSupport));
-    }
-}
-
-final class ClassLoaderSupportImpl11 extends ClassLoaderSupport {
+public final class ClassLoaderSupportImplJDK11OrLater extends ClassLoaderSupport {
 
     private final NativeImageClassLoaderSupport classLoaderSupport;
     private final Map<String, Set<Module>> packageToModules;
 
-    ClassLoaderSupportImpl11(NativeImageClassLoaderSupport classLoaderSupport) {
+    ClassLoaderSupportImplJDK11OrLater(NativeImageClassLoaderSupport classLoaderSupport) {
         this.classLoaderSupport = classLoaderSupport;
         packageToModules = new HashMap<>();
         buildPackageToModulesMap(classLoaderSupport);
@@ -102,7 +94,7 @@ public List<ResourceBundle> getResourceBundle(String bundleSpec, Locale locale)
         }
         ArrayList<ResourceBundle> resourceBundles = new ArrayList<>();
         for (Module module : modules) {
-            Module exportTargetModule = ClassLoaderSupportImpl8.class.getModule();
+            Module exportTargetModule = ClassLoaderSupportImplJDK11OrLater.class.getModule();
             if (!module.isExported(packageName, exportTargetModule)) {
                 Modules.addOpens(module, packageName, exportTargetModule);
             }
@@ -172,3 +164,17 @@ private void addToPackageNameModules(Module moduleName, String packageName) {
     }
 
 }
+
+@AutomaticFeature
+class ClassLoaderSupportFeatureJDK11OrLater implements Feature {
+    @Override
+    public boolean isInConfiguration(IsInConfigurationAccess access) {
+        return JavaVersionUtil.JAVA_SPEC >= 11;
+    }
+
+    @Override
+    public void afterRegistration(AfterRegistrationAccess a) {
+        FeatureImpl.AfterRegistrationAccessImpl access = (FeatureImpl.AfterRegistrationAccessImpl) a;
+        ImageSingletons.add(ClassLoaderSupport.class, new ClassLoaderSupportImplJDK11OrLater(access.getImageClassLoader().classLoaderSupport));
+    }
+}

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderSupportFeature.java renamed to substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderSupportImpl.java

@@ -36,23 +36,12 @@
 
 import com.oracle.svm.core.ClassLoaderSupport;
 import com.oracle.svm.core.annotate.AutomaticFeature;
-import com.oracle.svm.core.util.VMError;
 
-@AutomaticFeature
-public class ClassLoaderSupportFeature implements Feature {
-    @Override
-    public void afterRegistration(AfterRegistrationAccess a) {
-        VMError.guarantee(JavaVersionUtil.JAVA_SPEC <= 8);
-        FeatureImpl.AfterRegistrationAccessImpl access = (FeatureImpl.AfterRegistrationAccessImpl) a;
-        ImageSingletons.add(ClassLoaderSupport.class, new ClassLoaderSupportImpl8(access.getImageClassLoader().classLoaderSupport));
-    }
-}
-
-final class ClassLoaderSupportImpl8 extends ClassLoaderSupport {
+public final class ClassLoaderSupportImpl extends ClassLoaderSupport {
 
     private final ClassLoader imageClassLoader;
 
-    ClassLoaderSupportImpl8(NativeImageClassLoaderSupport classLoaderSupport) {
+    ClassLoaderSupportImpl(NativeImageClassLoaderSupport classLoaderSupport) {
         this.imageClassLoader = classLoaderSupport.getClassLoader();
     }
 
@@ -66,3 +55,17 @@ public List<ResourceBundle> getResourceBundle(String bundleName, Locale locale)
         return Collections.singletonList(ResourceBundle.getBundle(bundleName, locale, imageClassLoader));
     }
 }
+
+@AutomaticFeature
+class ClassLoaderSupportFeature implements Feature {
+    @Override
+    public boolean isInConfiguration(IsInConfigurationAccess access) {
+        return JavaVersionUtil.JAVA_SPEC == 8;
+    }
+
+    @Override
+    public void afterRegistration(AfterRegistrationAccess a) {
+        FeatureImpl.AfterRegistrationAccessImpl access = (FeatureImpl.AfterRegistrationAccessImpl) a;
+        ImageSingletons.add(ClassLoaderSupport.class, new ClassLoaderSupportImpl(access.getImageClassLoader().classLoaderSupport));
+    }
+}

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

@@ -69,7 +69,7 @@ public final class ImageClassLoader {
     }
 
     public final Platform platform;
-    final NativeImageClassLoaderSupport classLoaderSupport;
+    public final NativeImageClassLoaderSupport classLoaderSupport;
 
     private final EconomicSet<Class<?>> applicationClasses = EconomicSet.create();
     private final EconomicSet<Class<?>> hostedOnlyClasses = EconomicSet.create();