[GR-57248] Delay resolution of vtable slots until final layer.

PullRequest: graal/18893

Author: teshull

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/HostVM.java

@@ -33,7 +33,6 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
@@ -441,8 +440,4 @@ public boolean allowConstantFolding(AnalysisMethod method) {
          */
         return method.isOriginalMethod();
     }
-
-    public Set<AnalysisMethod> loadOpenTypeWorldDispatchTableMethods(@SuppressWarnings("unused") AnalysisType type) {
-        return Set.of();
-    }
 }

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

@@ -430,6 +430,11 @@ protected void persistMethod(AnalysisMethod method, EconomicMap<String, Object>
         imageLayerWriterHelper.persistMethod(method, methodMap);
     }
 
+    public boolean isMethodPersisted(AnalysisMethod method) {
+        String name = imageLayerSnapshotUtil.getMethodIdentifier(method);
+        return methodsMap.containsKey(name);
+    }
+
     public void persistMethodGraphs() {
         for (AnalysisMethod method : aUniverse.getMethods()) {
             if (method.isReachable()) {

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java

@@ -1321,11 +1321,8 @@ public Set<AnalysisMethod> getOrCalculateOpenTypeWorldDispatchTableMethods() {
             return dispatchTableMethods;
         }
         if (getWrapped() instanceof BaseLayerType) {
-            var result = universe.hostVM.loadOpenTypeWorldDispatchTableMethods(this);
-
-            // ensure result is fully visible across threads
-            VarHandle.storeStoreFence();
-            dispatchTableMethods = result;
+            // GR-58587 implement proper support.
+            dispatchTableMethods = Set.of();
             return dispatchTableMethods;
         }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java

@@ -30,12 +30,14 @@
 
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.LogHandler;
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CodePointer;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.WordFactory;
 
-import com.oracle.svm.core.heap.RestrictHeapAccess;
 import com.oracle.svm.core.graal.code.StubCallingConvention;
+import com.oracle.svm.core.heap.RestrictHeapAccess;
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.snippets.KnownIntrinsics;
 import com.oracle.svm.core.stack.StackOverflowCheck;
@@ -47,9 +49,11 @@
  * the stubs provide full diagnostic output with a stack trace.
  */
 public final class InvalidMethodPointerHandler {
+    @Platforms(Platform.HOSTED_ONLY.class) //
     public static final Method INVALID_VTABLE_ENTRY_HANDLER_METHOD = ReflectionUtil.lookupMethod(InvalidMethodPointerHandler.class, "invalidVTableEntryHandler");
     public static final String INVALID_VTABLE_ENTRY_MSG = "Fatal error: Virtual method call used an illegal vtable entry that was seen as unused by the static analysis";
 
+    @Platforms(Platform.HOSTED_ONLY.class) //
     public static final Method METHOD_POINTER_NOT_COMPILED_HANDLER_METHOD = ReflectionUtil.lookupMethod(InvalidMethodPointerHandler.class, "methodPointerNotCompiledHandler");
     public static final String METHOD_POINTER_NOT_COMPILED_MSG = "Fatal error: Method pointer invoked on a method that was not compiled because it was not seen as invoked by the static analysis nor was it directly registered for compilation";
 

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

@@ -1078,13 +1078,4 @@ public boolean allowConstantFolding(AnalysisMethod method) {
     public SimulateClassInitializerSupport createSimulateClassInitializerSupport(AnalysisMetaAccess aMetaAccess) {
         return new SimulateClassInitializerSupport(aMetaAccess, this);
     }
-
-    @Override
-    public Set<AnalysisMethod> loadOpenTypeWorldDispatchTableMethods(AnalysisType type) {
-        /*
-         * Will be enabled as part of GR-57248
-         */
-        // return OpenTypeWorldFeature.loadDispatchTable(type);
-        return Set.of();
-    }
 }

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

@@ -194,27 +194,6 @@ private static void handleNameConflict(String message) {
         }
     }
 
-    @Override
-    protected boolean shouldPersistMethod(AnalysisMethod method) {
-        if (super.shouldPersistMethod(method)) {
-            return true;
-        }
-
-        /*
-         * If the method is present in a dispatch table of a persisted type, then it also should be
-         * persisted.
-         *
-         * Will be enabled as part of GR-57248
-         */
-        /*-
-        AnalysisType type = method.getDeclaringClass();
-        if (type.isReachable()) {
-            return type.getOpenTypeWorldDispatchTableMethods().contains(method);
-        }
-         */
-        return false;
-    }
-
     @Override
     public void persistMethod(AnalysisMethod method, EconomicMap<String, Object> methodMap) {
         super.persistMethod(method, methodMap);

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

@@ -24,23 +24,33 @@
  */
 package com.oracle.svm.hosted.image;
 
-import static com.oracle.svm.hosted.image.NativeImage.localSymbolNameForMethod;
+import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.objectfile.ObjectFile;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
+import com.oracle.svm.core.imagelayer.ImageLayerBuildingSupport;
+import com.oracle.svm.core.meta.MethodPointer;
+import com.oracle.svm.hosted.imagelayer.LayeredDispatchTableSupport;
 import com.oracle.svm.hosted.meta.HostedMethod;
-import org.graalvm.nativeimage.ImageSingletons;
 
 public class MethodPointerRelocationProvider {
 
+    private final boolean imageLayer = ImageLayerBuildingSupport.buildingImageLayer();
+
     public static MethodPointerRelocationProvider singleton() {
         return ImageSingletons.lookup(MethodPointerRelocationProvider.class);
     }
 
     public void markMethodPointerRelocation(ObjectFile.ProgbitsSectionImpl section, int offset, ObjectFile.RelocationKind relocationKind, HostedMethod target,
-                    long addend, @SuppressWarnings("unused") boolean isStaticallyResolved) {
-        section.markRelocationSite(offset, relocationKind, localSymbolNameForMethod(target), addend);
+                    long addend, MethodPointer methodPointer, boolean isInjectedNotCompiled) {
+        String symbolName;
+        if (imageLayer) {
+            symbolName = LayeredDispatchTableSupport.singleton().getSymbolName(methodPointer, target, isInjectedNotCompiled);
+        } else {
+            symbolName = NativeImage.localSymbolNameForMethod(target);
+        }
+        section.markRelocationSite(offset, relocationKind, symbolName, addend);
     }
 }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/MethodPointerRelocationProvider.java

@@ -109,6 +109,7 @@
 import com.oracle.svm.hosted.image.RelocatableBuffer.Info;
 import com.oracle.svm.hosted.imagelayer.HostedDynamicLayerInfo;
 import com.oracle.svm.hosted.imagelayer.HostedImageLayerBuildingSupport;
+import com.oracle.svm.hosted.imagelayer.LayeredDispatchTableSupport;
 import com.oracle.svm.hosted.meta.HostedMetaAccess;
 import com.oracle.svm.hosted.meta.HostedMethod;
 import com.oracle.svm.hosted.meta.HostedType;
@@ -512,6 +513,9 @@ public void build(String imageName, DebugContext debug) {
             if (ImageLayerBuildingSupport.buildingExtensionLayer()) {
                 HostedDynamicLayerInfo.singleton().defineSymbolsForPriorLayerMethods(objectFile);
             }
+            if (ImageLayerBuildingSupport.buildingImageLayer()) {
+                LayeredDispatchTableSupport.singleton().defineDispatchTableSlotSymbols(objectFile, textSection, codeCache, metaAccess);
+            }
 
             // Mark the sections with the relocations from the maps.
             markRelocationSitesFromBuffer(textBuffer, textImpl);
@@ -627,13 +631,15 @@ private void markFunctionRelocationSite(final ProgbitsSectionImpl sectionImpl, f
         MethodPointer methodPointer = (MethodPointer) info.getTargetObject();
         ResolvedJavaMethod method = methodPointer.getMethod();
         HostedMethod target = (method instanceof HostedMethod) ? (HostedMethod) method : heap.hUniverse.lookup(method);
+        boolean injectedNotCompiled = false;
         if (!target.isCompiled() && !target.isCompiledInPriorLayer()) {
             target = metaAccess.lookupJavaMethod(InvalidMethodPointerHandler.METHOD_POINTER_NOT_COMPILED_HANDLER_METHOD);
+            injectedNotCompiled = true;
         }
 
         assert checkMethodPointerRelocationKind(info);
         // A reference to a method. Mark the relocation site using the symbol name.
-        relocationProvider.markMethodPointerRelocation(sectionImpl, offset, info.getRelocationKind(), target, info.getAddend(), methodPointer.isAbsolute());
+        relocationProvider.markMethodPointerRelocation(sectionImpl, offset, info.getRelocationKind(), target, info.getAddend(), methodPointer, injectedNotCompiled);
     }
 
     private static boolean isAddendAligned(Architecture arch, long addend, RelocationKind kind) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java

@@ -199,7 +199,7 @@ public List<Pair<HostedMethod, CompilationResult>> getOrderedCompilations() {
 
     public abstract int codeSizeFor(HostedMethod method);
 
-    protected CompilationResult compilationResultFor(HostedMethod method) {
+    public CompilationResult compilationResultFor(HostedMethod method) {
         return compilations.get(method);
     }