Avoid createCallTarget() in GraalWasm.

Author: fniephaus

wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmJsApiSuite.java

@@ -78,7 +78,6 @@
 import org.graalvm.wasm.utils.Assert;
 import org.junit.Test;
 
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.ArityException;
@@ -203,12 +202,12 @@ public void testInstantiateWithImportTable() throws IOException {
                             }),
             });
             WebAssembly.tableWrite(table, 0, new WasmFunctionInstance(context, null,
-                            Truffle.getRuntime().createCallTarget(new RootNode(context.language()) {
+                            new RootNode(context.language()) {
                                 @Override
                                 public Object execute(VirtualFrame frame) {
                                     return 210;
                                 }
-                            })));
+                            }.getCallTarget()));
             final WasmInstance instance = moduleInstantiate(wasm, binaryWithTableImport, importObject);
             try {
                 final Object callFirst = WebAssembly.instanceExport(instance, "callFirst");
@@ -355,12 +354,12 @@ public void testExportTableTwice() throws IOException, InterruptedException {
             final InteropLibrary lib = InteropLibrary.getUncached();
             try {
                 final Object f = new WasmFunctionInstance(context, null,
-                                Truffle.getRuntime().createCallTarget(new RootNode(context.language()) {
+                                new RootNode(context.language()) {
                                     @Override
                                     public Object execute(VirtualFrame frame) {
                                         return 42;
                                     }
-                                }));
+                                }.getCallTarget());
                 final Object writeTable = wasm.readMember("table_write");
                 final Object readTable = wasm.readMember("table_read");
                 final Object a = WebAssembly.instanceExport(instance, "a");
@@ -641,12 +640,12 @@ public void testTableInstanceOutOfBoundsSet() throws IOException {
             final WasmFunctionInstance functionInstance = new WasmFunctionInstance(
                             null,
                             null,
-                            Truffle.getRuntime().createCallTarget(new RootNode(WasmContext.get(null).language()) {
+                            new RootNode(WasmContext.get(null).language()) {
                                 @Override
                                 public Object execute(VirtualFrame frame) {
                                     return 42;
                                 }
-                            }));
+                            }.getCallTarget());
 
             // We should be able to set element 1.
             try {

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmInstantiator.java

@@ -42,7 +42,6 @@
 package org.graalvm.wasm;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.nodes.Node;
 import org.graalvm.wasm.exception.Failure;
@@ -61,7 +60,7 @@
 import java.util.List;
 
 /**
- * Creates wasm instances by converting parser nodes into truffle nodes.
+ * Creates wasm instances by converting parser nodes into Truffle nodes.
  */
 public class WasmInstantiator {
     private static final int MIN_DEFAULT_STACK_SIZE = 1_000_000;
@@ -145,8 +144,7 @@ private void instantiateCodeEntry(WasmInstance instance, CodeEntry codeEntry) {
          * nodes {@see TruffleRuntime#createDirectCallNode} during translation.
          */
         WasmRootNode rootNode = new WasmRootNode(language, instance, wasmCodeEntry);
-        RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
-        instance.setTarget(codeEntry.getFunctionIndex(), callTarget);
+        instance.setTarget(codeEntry.getFunctionIndex(), rootNode.getCallTarget());
         /*
          * Set the code entry local variables (which contain the parameters and the locals).
          */

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmLanguage.java

@@ -48,7 +48,6 @@
 import org.graalvm.wasm.memory.WasmMemory;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
@@ -83,12 +82,12 @@ protected CallTarget parse(ParsingRequest request) {
         final byte[] data = source.getBytes().toByteArray();
         final WasmModule module = WasmContext.readModule(moduleName, data, null, source);
         final WasmInstance instance = context.readInstance(module);
-        return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+        return new RootNode(this) {
             @Override
             public WasmInstance execute(VirtualFrame frame) {
                 return instance;
             }
-        });
+        }.getCallTarget();
     }
 
     @Override

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/BuiltinModule.java

@@ -41,8 +41,6 @@
 package org.graalvm.wasm.predefined;
 
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.nodes.RootNode;
 import org.graalvm.wasm.Assert;
 import org.graalvm.wasm.ReferenceTypes;
@@ -99,8 +97,7 @@ protected void defineFunction(WasmInstance instance, String name, byte[] paramTy
         // since predefined modules have a relatively small size.
         final int typeIdx = instance.symbolTable().allocateFunctionType(paramTypes, retTypes);
         final WasmFunction function = instance.symbolTable().declareExportedFunction(typeIdx, name);
-        RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
-        instance.setTarget(function.index(), callTarget);
+        instance.setTarget(function.index(), rootNode.getCallTarget());
     }
 
     protected int defineExternalGlobal(WasmInstance instance, String globalName, WasmGlobal global) {