Ensure LinkAtBuildTimeSupport is already available after afterRegistration

Author: olpaw

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

@@ -31,6 +31,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -50,6 +51,7 @@
 import com.oracle.svm.core.option.OptionUtils;
 import com.oracle.svm.core.option.SubstrateOptionsParser;
 import com.oracle.svm.core.util.UserError;
+import com.oracle.svm.hosted.jdk.ClassLoaderSupportFeatureJDK11OrLater;
 
 @AutomaticFeature
 public final class LinkAtBuildTimeFeature implements Feature {
@@ -73,12 +75,12 @@ static final class Options {
     private Map<URI, Module> uriModuleMap;
 
     @Override
-    public void afterRegistration(AfterRegistrationAccess access) {
-        ImageSingletons.add(LinkAtBuildTimeSupport.class, new LinkAtBuildTimeSupport(this));
+    public List<Class<? extends Feature>> getRequiredFeatures() {
+        return Collections.singletonList(ClassLoaderSupportFeatureJDK11OrLater.class);
     }
 
     @Override
-    public void beforeAnalysis(BeforeAnalysisAccess access) {
+    public void afterRegistration(AfterRegistrationAccess access) {
         classLoaderSupport = ImageSingletons.lookup(ClassLoaderSupport.class);
 
         var loader = ((FeatureImpl.BeforeAnalysisAccessImpl) access).getImageClassLoader();
@@ -95,6 +97,8 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
         requireCompletePackageOrClass.put("jdk.internal.reflect", null);
 
         Options.LinkAtBuildTime.getValue().getValuesWithOrigins().forEach(this::extractOptionValue);
+
+        ImageSingletons.add(LinkAtBuildTimeSupport.class, new LinkAtBuildTimeSupport(this));
     }
 
     private void extractOptionValue(Pair<String, OptionOrigin> valueOrigin) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/ClassLoaderSupportImplJDK11OrLater.java renamed to substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/ClassLoaderSupportFeatureJDK11OrLater.java

@@ -52,7 +52,7 @@
 import com.oracle.svm.hosted.FeatureImpl;
 import com.oracle.svm.util.ModuleSupport;
 
-public final class ClassLoaderSupportImplJDK11OrLater extends ClassLoaderSupportImpl {
+final class ClassLoaderSupportImplJDK11OrLater extends ClassLoaderSupportImpl {
 
     private final NativeImageClassLoaderSupportJDK11OrLater classLoaderSupport;
     private final Map<String, Set<Module>> packageToModules;
@@ -165,7 +165,7 @@ private void addToPackageNameModules(Module moduleName, String packageName) {
 }
 
 @AutomaticFeature
-class ClassLoaderSupportFeatureJDK11OrLater implements Feature {
+public class ClassLoaderSupportFeatureJDK11OrLater implements Feature {
     @Override
     public void afterRegistration(AfterRegistrationAccess a) {
         FeatureImpl.AfterRegistrationAccessImpl access = (FeatureImpl.AfterRegistrationAccessImpl) a;