Synthesize boot layer once before analysis

Author: ivan-ristovic

substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/BootModuleLayerSupport.java

@@ -24,7 +24,6 @@
  */
 package com.oracle.svm.core.jdk11;
 
-import com.oracle.svm.core.annotate.UnknownObjectField;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -35,7 +34,6 @@ public static BootModuleLayerSupport instance() {
         return ImageSingletons.lookup(BootModuleLayerSupport.class);
     }
 
-    @UnknownObjectField(types = ModuleLayer.class)
     private ModuleLayer bootLayer;
 
     @Platforms(Platform.HOSTED_ONLY.class)

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

@@ -30,7 +30,6 @@
 import com.oracle.svm.core.jdk.JDK11OrLater;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.ReflectionUtil;
-import jdk.internal.module.ModuleReferenceImpl;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -107,12 +106,12 @@ public void afterRegistration(AfterRegistrationAccess access) {
 
     @Override
     public void beforeAnalysis(BeforeAnalysisAccess access) {
-        // Because we synthesize the boot layer after analysis, we need to
-        // register every type in ModuleLayer's object graph as in heap
-        access.registerAsInHeap(ModuleLayer.class);
-        access.registerAsInHeap(Configuration.class);
-        access.registerAsInHeap(ResolvedModule.class);
-        access.registerAsInHeap(ModuleReferenceImpl.class);
+        FeatureImpl.BeforeAnalysisAccessImpl accessImpl = (FeatureImpl.BeforeAnalysisAccessImpl) access;
+        Map<String, Module> baseModules = ModuleLayer.boot().modules()
+                .stream()
+                .collect(Collectors.toMap(Module::getName, m -> m));
+        ModuleLayer runtimeBootLayer = synthesizeRuntimeBootLayer(accessImpl.imageClassLoader, baseModules);
+        BootModuleLayerSupport.instance().setBootLayer(runtimeBootLayer);
     }
 
     @Override