[GR-63802] WasmCallStubNode cannot be cast to WasmDirectCallNode.

PullRequest: graal/20493

Author: woess

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/Linker.java

@@ -73,8 +73,6 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.graalvm.wasm.Linker.ResolutionDag.CallsiteSym;
-import org.graalvm.wasm.Linker.ResolutionDag.CodeEntrySym;
 import org.graalvm.wasm.Linker.ResolutionDag.DataSym;
 import org.graalvm.wasm.Linker.ResolutionDag.ElemSym;
 import org.graalvm.wasm.Linker.ResolutionDag.ExportFunctionSym;
@@ -99,9 +97,6 @@
 import org.graalvm.wasm.globals.WasmGlobal;
 import org.graalvm.wasm.memory.WasmMemory;
 import org.graalvm.wasm.memory.WasmMemoryLibrary;
-import org.graalvm.wasm.nodes.WasmCallStubNode;
-import org.graalvm.wasm.nodes.WasmDirectCallNode;
-import org.graalvm.wasm.nodes.WasmIndirectCallNode;
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
@@ -110,7 +105,6 @@
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
-import com.oracle.truffle.api.nodes.Node;
 
 public class Linker {
     public enum LinkState {
@@ -122,6 +116,11 @@ public enum LinkState {
 
     private ResolutionDag resolutionDag;
 
+    /**
+     * Tries to link a module instance and other module instances in the store.
+     *
+     * @param instance the module instance that triggered the linking
+     */
     public void tryLink(WasmInstance instance) {
         // The first execution of a WebAssembly call target will trigger the linking of the modules
         // that are inside the current context (which will happen behind the call boundary).
@@ -131,22 +130,20 @@ public void tryLink(WasmInstance instance) {
         // compilation, and this check will fold away.
         // If the code is compiled synchronously, then this check will persist in the compiled code.
         // We nevertheless invalidate the compiled code that reaches this point.
-        if (CompilerDirectives.injectBranchProbability(CompilerDirectives.SLOWPATH_PROBABILITY, instance.isNonLinked() || instance.isLinkFailed())) {
-            // TODO: Once we support multi-threading, add adequate synchronization here.
+        if (CompilerDirectives.injectBranchProbability(CompilerDirectives.SLOWPATH_PROBABILITY, !instance.isLinkCompleted())) {
             tryLinkOutsidePartialEvaluation(instance);
-        } else {
-            assert instance.isLinkCompleted() || instance.isLinkInProgress();
         }
     }
 
     /**
+     * Tries to link a module instantiated via the JS API, with imports supplied by an importObject.
+     *
+     * @see org.graalvm.wasm.api.WebAssembly#moduleInstantiate(WasmModule, Object)
      * @see #tryLinkOutsidePartialEvaluation(WasmInstance, ImportValueSupplier)
      */
     public void tryLink(WasmInstance instance, ImportValueSupplier imports) {
-        if (instance.isNonLinked() || instance.isLinkFailed()) {
+        if (!instance.isLinkCompleted()) {
             tryLinkOutsidePartialEvaluation(instance, imports);
-        } else {
-            assert instance.isLinkCompleted() || instance.isLinkInProgress();
         }
     }
 
@@ -157,7 +154,7 @@ private static WasmException linkFailedError(WasmInstance instance) {
 
     @CompilerDirectives.TruffleBoundary
     private void tryLinkOutsidePartialEvaluation(WasmInstance entryPointInstance) {
-        tryLink(entryPointInstance, null);
+        tryLinkOutsidePartialEvaluation(entryPointInstance, null);
     }
 
     /**
@@ -172,25 +169,28 @@ private void tryLinkOutsidePartialEvaluation(WasmInstance entryPointInstance) {
      */
     @CompilerDirectives.TruffleBoundary
     private void tryLinkOutsidePartialEvaluation(WasmInstance entryPointInstance, ImportValueSupplier imports) {
-        if (entryPointInstance.isLinkFailed()) {
-            // If the linking of this module failed already, then throw.
-            throw linkFailedError(entryPointInstance);
-        }
-        // Some Truffle configurations allow that the code gets compiled before executing the code.
-        // We therefore check the link state again.
-        if (entryPointInstance.isNonLinked()) {
-            if (resolutionDag == null) {
-                resolutionDag = new ResolutionDag();
-            }
-            final WasmStore store = entryPointInstance.store();
-            Map<String, WasmInstance> instances = store.moduleInstances();
-            ArrayList<Throwable> failures = new ArrayList<>();
-            final int maxStartFunctionIndex = runLinkActions(store, instances, imports, failures);
-            linkTopologically(store, failures, maxStartFunctionIndex);
-            assignTypeEquivalenceClasses(store);
-            resolutionDag = null;
-            runStartFunctions(instances, failures);
-            checkFailures(failures);
+        final WasmStore store = entryPointInstance.store();
+        synchronized (store) {
+            var linkState = entryPointInstance.linkState();
+            if (linkState == LinkState.failed) {
+                // If the linking of this module failed already, then throw.
+                throw linkFailedError(entryPointInstance);
+            }
+            // Some Truffle configurations allow the code to be compiled before executing the code.
+            // We therefore check the link state again.
+            if (linkState == LinkState.nonLinked) {
+                if (resolutionDag == null) {
+                    resolutionDag = new ResolutionDag();
+                }
+                Map<String, WasmInstance> instances = store.moduleInstances();
+                ArrayList<Throwable> failures = new ArrayList<>();
+                final int maxStartFunctionIndex = runLinkActions(store, instances, imports, failures);
+                linkTopologically(store, failures, maxStartFunctionIndex);
+                assignTypeEquivalenceClasses(store);
+                resolutionDag = null;
+                runStartFunctions(instances, failures);
+                checkFailures(failures);
+            }
         }
     }
 
@@ -244,7 +244,9 @@ private static void assignTypeEquivalenceClasses(WasmStore store) {
     }
 
     private static void assignTypeEquivalenceClasses(WasmModule module, WasmLanguage language) {
-        synchronized (module) {
+        var lock = module.getLock();
+        lock.lock();
+        try {
             if (module.isParsed()) {
                 return;
             }
@@ -259,6 +261,8 @@ private static void assignTypeEquivalenceClasses(WasmModule module, WasmLanguage
                 function.setTypeEquivalenceClass(symtab.equivalenceClass(function.typeIndex()));
             }
             module.setParsed();
+        } finally {
+            lock.unlock();
         }
     }
 
@@ -462,33 +466,6 @@ void resolveFunctionExport(WasmModule module, int functionIndex, String exported
         resolutionDag.resolveLater(new ExportFunctionSym(module.name(), exportedFunctionName), dependencies, NO_RESOLVE_ACTION);
     }
 
-    public void resolveCallNode(Node[] callNodes, WasmInstance instance, int callNodeIndex, int bytecodeOffset) {
-        Node unresolvedCallNode = callNodes[callNodeIndex];
-        if (unresolvedCallNode instanceof WasmCallStubNode) {
-            final WasmFunction function = ((WasmCallStubNode) unresolvedCallNode).function();
-            final CallTarget target = instance.target(function.index());
-            callNodes[callNodeIndex] = WasmDirectCallNode.create(target, bytecodeOffset);
-        } else {
-            assert unresolvedCallNode instanceof WasmIndirectCallNode : unresolvedCallNode;
-        }
-    }
-
-    public void resolveCallsite(WasmInstance instance, Node[] callNodes, int instructionOffset, int controlTableOffset, int bytecodeOffset, WasmFunction function) {
-        final Runnable resolveAction = () -> resolveCallNode(callNodes, instance, controlTableOffset, bytecodeOffset);
-        final Sym[] dependencies = new Sym[]{
-                        function.isImported()
-                                        ? new ImportFunctionSym(instance.name(), function.importDescriptor(), function.index())
-                                        : new CodeEntrySym(instance.name(), function.index())};
-        resolutionDag.resolveLater(new CallsiteSym(instance.name(), instructionOffset, controlTableOffset), dependencies, resolveAction);
-    }
-
-    void resolveCodeEntry(WasmModule module, int functionIndex) {
-        if (resolutionDag == null) {
-            resolutionDag = new ResolutionDag();
-        }
-        resolutionDag.resolveLater(new CodeEntrySym(module.name(), functionIndex), ResolutionDag.NO_DEPENDENCIES, NO_RESOLVE_ACTION);
-    }
-
     void resolveMemoryImport(WasmStore store, WasmInstance instance, ImportDescriptor importDescriptor, int memoryIndex, long declaredMinSize, long declaredMaxSize, boolean typeIndex64,
                     boolean shared, ImportValueSupplier imports) {
         final String importedModuleName = importDescriptor.moduleName();
@@ -1160,64 +1137,6 @@ public boolean equals(Object object) {
             }
         }
 
-        static class CallsiteSym extends Sym {
-            final int instructionOffset;
-            final int controlTableOffset;
-
-            CallsiteSym(String moduleName, int instructionOffset, int controlTableOffset) {
-                super(moduleName);
-                this.instructionOffset = instructionOffset;
-                this.controlTableOffset = controlTableOffset;
-            }
-
-            @Override
-            public String toString() {
-                return String.format(Locale.ROOT, "(callsite %d at %d in %s)", controlTableOffset, instructionOffset, moduleName);
-            }
-
-            @Override
-            public int hashCode() {
-                return moduleName.hashCode() ^ instructionOffset ^ (controlTableOffset << 16);
-            }
-
-            @Override
-            public boolean equals(Object object) {
-                if (!(object instanceof CallsiteSym)) {
-                    return false;
-                }
-                final CallsiteSym that = (CallsiteSym) object;
-                return this.instructionOffset == that.instructionOffset && this.controlTableOffset == that.controlTableOffset && this.moduleName.equals(that.moduleName);
-            }
-        }
-
-        static class CodeEntrySym extends Sym {
-            final int functionIndex;
-
-            CodeEntrySym(String moduleName, int functionIndex) {
-                super(moduleName);
-                this.functionIndex = functionIndex;
-            }
-
-            @Override
-            public String toString() {
-                return String.format(Locale.ROOT, "(code entry at %d in %s)", functionIndex, moduleName);
-            }
-
-            @Override
-            public int hashCode() {
-                return moduleName.hashCode() ^ functionIndex;
-            }
-
-            @Override
-            public boolean equals(Object object) {
-                if (!(object instanceof CodeEntrySym)) {
-                    return false;
-                }
-                final CodeEntrySym that = (CodeEntrySym) object;
-                return this.functionIndex == that.functionIndex && this.moduleName.equals(that.moduleName);
-            }
-        }
-
         static class ImportMemorySym extends Sym {
             final ImportDescriptor importDescriptor;
             final int memoryIndex;

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/RuntimeState.java

@@ -108,7 +108,7 @@ public abstract class RuntimeState {
      */
     private final int droppedDataInstanceOffset;
 
-    @CompilationFinal private Linker.LinkState linkState;
+    @CompilationFinal private volatile Linker.LinkState linkState;
 
     @CompilationFinal private int startFunctionIndex;
 
@@ -187,6 +187,10 @@ public WasmContext context() {
         return store().context();
     }
 
+    public Linker.LinkState linkState() {
+        return linkState;
+    }
+
     public boolean isNonLinked() {
         return linkState == Linker.LinkState.nonLinked;
     }