[GR-58518] Register base layer virtual calls as roots.

PullRequest: graal/19029

Author: teshull

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageLayerWriter.java

@@ -321,6 +321,10 @@ protected void persistHook() {
 
     }
 
+    public boolean isTypePersisted(AnalysisType type) {
+        return persistedTypeIds.contains(type.getId());
+    }
+
     protected void persistType(AnalysisType type) {
         if (!persistedTypeIds.add(type.getId())) {
             return;

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StrengthenGraphs.java

@@ -675,7 +675,7 @@ private void handleInvoke(Invoke invoke, SimplifierTool tool) {
                 /* Last resort, try to inject profiles optimistically. */
                 TypeState receiverTypeState = null;
                 if (invokeFlow.getTargetMethod().hasReceiver()) {
-                    if (invokeFlow.isSaturated()) {
+                    if (methodFlow.isSaturated((PointsToAnalysis) bb, invokeFlow)) {
                         /*
                          * For saturated invokes use all seen instantiated subtypes of target method
                          * declaring class. In an open world this is incomplete as new types may be

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/layeredimagesingleton/ImageSingletonLoader.java

@@ -27,6 +27,9 @@
 import java.util.List;
 
 public interface ImageSingletonLoader {
+
+    List<Boolean> readBoolList(String keyName);
+
     int readInt(String keyName);
 
     List<Integer> readIntList(String keyName);

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/layeredimagesingleton/ImageSingletonWriter.java

@@ -27,6 +27,9 @@
 import java.util.List;
 
 public interface ImageSingletonWriter {
+
+    void writeBoolList(String keyName, List<Boolean> value);
+
     void writeInt(String keyName, int value);
 
     void writeIntList(String keyName, List<Integer> value);

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

@@ -69,6 +69,12 @@ public void beforeUniverseBuilding(BeforeUniverseBuildingAccess access) {
         }
     }
 
+    public Set<Module> getBuilderModules() {
+        Module m0 = ImageSingletons.lookup(VMFeature.class).getClass().getModule();
+        Module m1 = SVMHost.class.getModule();
+        return m0.equals(m1) ? Set.of(m0) : Set.of(m0, m1);
+    }
+
     private final Set<AnalysisType> triggeredTypes = new HashSet<>();
     private final Set<AnalysisMethod> triggeredMethods = new HashSet<>();
 

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

@@ -238,13 +238,7 @@ public SVMHost(OptionValues options, ImageClassLoader loader, ClassInitializatio
         }
 
         enableTrackAcrossLayers = ImageLayerBuildingSupport.buildingSharedLayer();
-        builderModules = getBuilderModules();
-    }
-
-    private static Set<Module> getBuilderModules() {
-        Module m0 = ImageSingletons.lookup(VMFeature.class).getClass().getModule();
-        Module m1 = SVMHost.class.getModule();
-        return m0.equals(m1) ? Set.of(m0) : Set.of(m0, m1);
+        builderModules = ImageSingletons.contains(OpenTypeWorldFeature.class) ? ImageSingletons.lookup(OpenTypeWorldFeature.class).getBuilderModules() : null;
     }
 
     /**

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java

@@ -60,6 +60,7 @@
 import com.oracle.svm.core.graal.phases.OptimizeExceptionPathsPhase;
 import com.oracle.svm.core.heap.RestrictHeapAccess;
 import com.oracle.svm.core.heap.RestrictHeapAccessCallees;
+import com.oracle.svm.core.imagelayer.ImageLayerBuildingSupport;
 import com.oracle.svm.core.meta.MethodPointer;
 import com.oracle.svm.core.meta.SubstrateMethodPointerConstant;
 import com.oracle.svm.core.util.InterruptImageBuilding;
@@ -69,6 +70,7 @@
 import com.oracle.svm.hosted.NativeImageOptions;
 import com.oracle.svm.hosted.ProgressReporter;
 import com.oracle.svm.hosted.diagnostic.HostedHeapDumpFeature;
+import com.oracle.svm.hosted.imagelayer.LayeredDispatchTableSupport;
 import com.oracle.svm.hosted.meta.HostedMethod;
 import com.oracle.svm.hosted.meta.HostedUniverse;
 import com.oracle.svm.hosted.phases.ImageBuildStatisticsCounterPhase;
@@ -184,6 +186,8 @@ public record UnpublishedTrivialMethods(CompilationGraph unpublishedGraph, boole
 
     private final ConcurrentMap<HostedMethod, UnpublishedTrivialMethods> unpublishedTrivialMethods = new ConcurrentHashMap<>();
 
+    private final LayeredDispatchTableSupport layeredDispatchTableSupport = ImageLayerBuildingSupport.buildingSharedLayer() ? LayeredDispatchTableSupport.singleton() : null;
+
     public abstract static class CompileReason {
         /**
          * For debugging only: chaining of the compile reason, so that you can track the compilation
@@ -392,7 +396,7 @@ public void finish(DebugContext debug) {
                 parseAll();
             }
 
-            if (!PointstoOptions.UseExperimentalReachabilityAnalysis.getValue(universe.hostVM().options())) {
+            if (!ImageLayerBuildingSupport.buildingImageLayer() && !PointstoOptions.UseExperimentalReachabilityAnalysis.getValue(universe.hostVM().options())) {
                 /*
                  * Reachability Analysis creates call graphs with more edges compared to the
                  * Points-to Analysis, therefore the annotations would have to be added to a lot
@@ -950,14 +954,9 @@ public void scheduleEntryPoints() {
         }
     }
 
-    private static boolean layeredForceCompilation(HostedMethod hMethod) {
-        /*
-         * If a method from a base layer interface is not compiled in a prior layer but is in the
-         * vtable of a type from a new layer, the method needs to be compiled as there would be a
-         * missing symbol otherwise.
-         */
-        return hMethod.wrapped.isInBaseLayer() && !hMethod.isCompiledInPriorLayer() && hMethod.getDeclaringClass().isInterface() &&
-                        Arrays.stream(hMethod.getDeclaringClass().getSubTypes()).anyMatch(t -> !t.getWrapped().isInBaseLayer() && hMethod.isInVirtualMethodTable(t));
+    private static boolean layeredForceCompilation(@SuppressWarnings("unused") HostedMethod hMethod) {
+        // GR-57021 force some methods to be compiled in initial layer
+        return false;
     }
 
     public void scheduleDeoptTargets() {
@@ -1345,6 +1344,9 @@ protected void ensureCalleesCompiled(HostedMethod method, CompileReason reason,
                 if (call.direct || isDynamicallyResolvedCall(result, call)) {
                     ensureCompiled(callTarget, new DirectCallReason(method, reason));
                 } else if (callTarget != null && callTarget.getImplementations() != null) {
+                    if (layeredDispatchTableSupport != null) {
+                        layeredDispatchTableSupport.recordVirtualCallTarget(method, callTarget);
+                    }
                     for (HostedMethod impl : callTarget.getImplementations()) {
                         ensureCompiled(impl, new VirtualCallReason(method, callTarget, reason));
                     }

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

@@ -391,6 +391,15 @@ private static <T> T cast(Object object) {
         return (T) object;
     }
 
+    @Override
+    public List<Boolean> readBoolList(String keyName) {
+        List<Object> value = cast(keyStore.get(keyName));
+        String type = cast(value.get(0));
+        assert type.equals("B(") : type;
+        List<Integer> internalValue = cast(value.get(1));
+        return internalValue.stream().map(e -> e == 1).toList();
+    }
+
     @Override
     public int readInt(String keyName) {
         List<Object> value = cast(keyStore.get(keyName));

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

@@ -317,6 +317,13 @@ EconomicMap<String, Object> getKeyValueStore() {
         return keyValueStore;
     }
 
+    @Override
+    public void writeBoolList(String keyName, List<Boolean> value) {
+        var internalValue = value.stream().map(e -> e ? 1 : 0).toList();
+        var previous = keyValueStore.put(keyName, List.of("B(", internalValue));
+        assert previous == null : previous;
+    }
+
     @Override
     public void writeInt(String keyName, int value) {
         var previous = keyValueStore.put(keyName, List.of("I", value));