Allow loader to unset SharedLayerGraphs separately.

Author: cstancu

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/SVMImageLayerLoader.java

@@ -91,14 +91,16 @@
 public class SVMImageLayerLoader extends ImageLayerLoader {
 
     private final Field dynamicHubArrayHubField;
+    private final boolean useSharedLayerGraphs;
 
     private HostedUniverse hostedUniverse;
     private final ImageClassLoader imageClassLoader;
 
-    public SVMImageLayerLoader(List<FilePaths> loadPaths, ImageClassLoader imageClassLoader) {
+    public SVMImageLayerLoader(List<FilePaths> loadPaths, ImageClassLoader imageClassLoader, boolean useSharedLayerGraphs) {
         super(loadPaths);
         dynamicHubArrayHubField = ReflectionUtil.lookupField(DynamicHub.class, "arrayHub");
         this.imageClassLoader = imageClassLoader;
+        this.useSharedLayerGraphs = useSharedLayerGraphs;
     }
 
     public void setHostedUniverse(HostedUniverse hostedUniverse) {
@@ -109,6 +111,14 @@ public HostedUniverse getHostedUniverse() {
         return hostedUniverse;
     }
 
+    @Override
+    public boolean hasAnalysisParsedGraph(AnalysisMethod analysisMethod) {
+        if (!useSharedLayerGraphs) {
+            return false;
+        }
+        return super.hasAnalysisParsedGraph(analysisMethod);
+    }
+
     public ClassInitializationInfo getClassInitializationInfo(AnalysisType type) {
         PersistedAnalysisType.Reader typeMap = findType(type.getId());
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/HostedImageLayerBuildingSupport.java

@@ -180,18 +180,19 @@ public static HostedImageLayerBuildingSupport initialize(HostedOptionValues valu
         WriteLayerArchiveSupport writeLayerArchiveSupport = null;
         SVMImageLayerWriter writer = null;
         ArchiveSupport archiveSupport = new ArchiveSupport(false);
+        Boolean useSharedLayerGraphs = SubstrateOptions.UseSharedLayerGraphs.getValue(values);
         if (buildingSharedLayer) {
             LayerOption layerOption = LayerOption.parse(LayerCreate.getValue(values).lastValue().orElseThrow());
             writeLayerArchiveSupport = new WriteLayerArchiveSupport(archiveSupport, layerOption.fileName());
-            writer = new SVMImageLayerWriter(SubstrateOptions.UseSharedLayerGraphs.getValue(values));
+            writer = new SVMImageLayerWriter(useSharedLayerGraphs);
         }
         SVMImageLayerLoader loader = null;
         LoadLayerArchiveSupport loadLayerArchiveSupport = null;
         if (buildingExtensionLayer) {
             Path layerFileName = LayerUse.getValue(values).lastValue().orElseThrow();
             loadLayerArchiveSupport = new LoadLayerArchiveSupport(layerFileName, archiveSupport);
             ImageLayerLoader.FilePaths paths = new ImageLayerLoader.FilePaths(loadLayerArchiveSupport.getSnapshotPath(), loadLayerArchiveSupport.getSnapshotGraphsPath());
-            loader = new SVMImageLayerLoader(List.of(paths), imageClassLoader);
+            loader = new SVMImageLayerLoader(List.of(paths), imageClassLoader, useSharedLayerGraphs);
         }
 
         return new HostedImageLayerBuildingSupport(loader, writer, buildingImageLayer, buildingInitialLayer, buildingFinalLayer, writeLayerArchiveSupport, loadLayerArchiveSupport);