[GR-25654] [GR-33795] Migrate from createCallTarget() to getCallTarget().

fniephaus · fniephaus · commit 4f2f2c3cb2db · 2021-10-05T14:57:48.000Z
PullRequest: graalpython/1985
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/WithPythonContextRule.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/WithPythonContextRule.java
@@ -51,7 +51,6 @@
 import com.oracle.graal.python.test.PythonTests;
 import com.oracle.graal.python.util.Consumer;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
 
@@ -90,7 +89,7 @@ public Statement apply(final Statement base, FrameworkMethod method, Object targ
             public void evaluate() throws Throwable {
                 PythonTests.enterContext(getOptions(), new String[0]);
 
-                RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(new RootNode(null) {
+                RootCallTarget callTarget = new RootNode(null) {
                     @Override
                     public Object execute(VirtualFrame frame) {
                         pythonContext = PythonContext.get(this);
@@ -101,7 +100,7 @@ public Object execute(VirtualFrame frame) {
                         }
                         return null;
                     }
-                });
+                }.getCallTarget();
                 Throwable result = (Throwable) callTarget.call();
                 PythonTests.closeContext();
                 if (result != null) {
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/builtins/modules/ClinicTests.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/builtins/modules/ClinicTests.java
@@ -70,7 +70,6 @@
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.test.PythonTests;
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -179,7 +178,7 @@ public void testCustomConvertor() {
     }
 
     private static CallTarget createCallTarget(PythonBinaryClinicBuiltinNode node) {
-        return Truffle.getRuntime().createCallTarget(new BinaryBuiltinRoot(node));
+        return new BinaryBuiltinRoot(node).getCallTarget();
     }
 
     private static final class BinaryBuiltinRoot extends RootNode {
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/builtins/modules/ConversionNodeTests.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/builtins/modules/ConversionNodeTests.java
@@ -58,7 +58,6 @@
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 public class ConversionNodeTests {
@@ -69,7 +68,7 @@ protected static Object call(Object arg, ArgumentCastNode castNode) {
         PythonLanguage language = PythonLanguage.get(castNode);
         final PythonContext pythonContext = PythonContext.get(castNode);
 
-        RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(new PRootNode(language) {
+        RootCallTarget callTarget = new PRootNode(language) {
             @Child private CalleeContext calleeContext = CalleeContext.create();
             @Child private ArgumentCastNode node = castNode;
 
@@ -95,7 +94,7 @@ public Signature getSignature() {
             public boolean isPythonInternal() {
                 return true;
             }
-        });
+        }.getCallTarget();
         try {
             Object[] arguments = PArguments.create(1);
             PArguments.setGlobals(arguments, PythonObjectFactory.getUncached().createDict());
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/nodes/util/CastToJavaUnsignedLongNodeTests.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/nodes/util/CastToJavaUnsignedLongNodeTests.java
@@ -46,7 +46,6 @@
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.test.PythonTests;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
 import org.junit.After;
@@ -145,35 +144,35 @@ private static void expect(PythonBuiltinClassType errorType, Runnable test) {
     }
 
     private static long castInt(int arg) {
-        return (Long) Truffle.getRuntime().createCallTarget(new RootNode(null) {
+        return (Long) new RootNode(null) {
             @Child private CastToJavaUnsignedLongNode castNode = CastToJavaUnsignedLongNode.create();
 
             @Override
             public Object execute(VirtualFrame frame) {
                 return castNode.execute(arg);
             }
-        }).call();
+        }.getCallTarget().call();
     }
 
     private static long castLong(long arg) {
-        return (Long) Truffle.getRuntime().createCallTarget(new RootNode(null) {
+        return (Long) new RootNode(null) {
             @Child private CastToJavaUnsignedLongNode castNode = CastToJavaUnsignedLongNode.create();
 
             @Override
             public Object execute(VirtualFrame frame) {
                 return castNode.execute(arg);
             }
-        }).call();
+        }.getCallTarget().call();
     }
 
     private static long castObject(Object arg) {
-        return (Long) Truffle.getRuntime().createCallTarget(new RootNode(null) {
+        return (Long) new RootNode(null) {
             @Child private CastToJavaUnsignedLongNode castNode = CastToJavaUnsignedLongNode.create();
 
             @Override
             public Object execute(VirtualFrame frame) {
                 return castNode.execute(arg);
             }
-        }).call();
+        }.getCallTarget().call();
     }
 }
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/PythonModuleTests.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/PythonModuleTests.java
@@ -46,7 +46,6 @@
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.test.PythonTests;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
 
@@ -59,7 +58,7 @@ private static class PythonModuleTestRootNode extends RootNode {
         public PythonModuleTestRootNode(PythonLanguage language, CallNode body) {
             super(language);
             this.body = body;
-            Truffle.getRuntime().createCallTarget(this);
+            this.getCallTarget(); // Ensure call target is initialized
         }
 
         @Override
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_cmd_line.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_cmd_line.txt
@@ -14,5 +14,4 @@
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_unmached_quote
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_usage
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_verbose
-*graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_version
 *graalpython.lib-python.3.test.test_cmd_line.IgnoreEnvironmentTest.test_ignore_PYTHONPATH
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_multiprocessing_spawn.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_multiprocessing_spawn.txt
@@ -132,8 +132,6 @@
 *graalpython.lib-python.3.test.test_multiprocessing_spawn.WithProcessesTestProcess.test_cpu_count
 *graalpython.lib-python.3.test.test_multiprocessing_spawn.WithProcessesTestProcess.test_current
 *graalpython.lib-python.3.test.test_multiprocessing_spawn.WithProcessesTestProcess.test_daemon_argument
-*graalpython.lib-python.3.test.test_multiprocessing_spawn.WithProcessesTestProcess.test_error_on_stdio_flush_1
-*graalpython.lib-python.3.test.test_multiprocessing_spawn.WithProcessesTestProcess.test_error_on_stdio_flush_2
 *graalpython.lib-python.3.test.test_multiprocessing_spawn.WithProcessesTestProcess.test_forkserver_sigint
 *graalpython.lib-python.3.test.test_multiprocessing_spawn.WithProcessesTestProcess.test_forkserver_sigkill
 *graalpython.lib-python.3.test.test_multiprocessing_spawn.WithProcessesTestProcess.test_kill
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java
@@ -102,6 +102,7 @@
 
 @TruffleLanguage.Registration(id = PythonLanguage.ID, //
                 name = PythonLanguage.NAME, //
+                implementationName = PythonLanguage.IMPLEMENTATION_NAME, //
                 version = PythonLanguage.VERSION, //
                 characterMimeTypes = {PythonLanguage.MIME_TYPE,
                                 PythonLanguage.MIME_TYPE_COMPILE0, PythonLanguage.MIME_TYPE_COMPILE1, PythonLanguage.MIME_TYPE_COMPILE2,
@@ -126,6 +127,7 @@
 public final class PythonLanguage extends TruffleLanguage<PythonContext> {
     public static final String ID = "python";
     public static final String NAME = "Python";
+    public static final String IMPLEMENTATION_NAME = "GraalVM Python";
     public static final int MAJOR = 3;
     public static final int MINOR = 8;
     public static final int MICRO = 5;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SortNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SortNodes.java
@@ -71,7 +71,6 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
@@ -470,7 +469,7 @@ private RootCallTarget getComparatorCallTarget(PythonLanguage language) {
                  * Every sort node should get its own copy to be able to optimize sorts of different
                  * types. Don't put the call targets to the language cache.
                  */
-                comparatorCallTarget = Truffle.getRuntime().createCallTarget(new ObjectComparatorRootNode(language));
+                comparatorCallTarget = new ObjectComparatorRootNode(language).getCallTarget();
             }
             return comparatorCallTarget;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/PythonUtils.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/PythonUtils.java
@@ -73,7 +73,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.memory.ByteArraySupport;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -348,11 +347,7 @@ public static void dumpHeap(String path) {
      */
     @TruffleBoundary
     public static RootCallTarget getOrCreateCallTarget(RootNode rootNode) {
-        RootCallTarget ct = rootNode.getCallTarget();
-        if (ct == null) {
-            ct = Truffle.getRuntime().createCallTarget(rootNode);
-        }
-        return ct;
+        return rootNode.getCallTarget();
     }
 
     @TruffleBoundary

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@`
`70`	`70`	`import com.oracle.graal.python.runtime.exception.PException;`
`71`	`71`	`import com.oracle.graal.python.test.PythonTests;`
`72`	`72`	`import com.oracle.truffle.api.CallTarget;`
`73`		`-import com.oracle.truffle.api.Truffle;`
`74`	`73`	`import com.oracle.truffle.api.dsl.Specialization;`
`75`	`74`	`import com.oracle.truffle.api.frame.VirtualFrame;`
`76`	`75`	`import com.oracle.truffle.api.nodes.RootNode;`
`@@ -179,7 +178,7 @@ public void testCustomConvertor() {`
`179`	`178`	`}`
`180`	`179`
`181`	`180`	`private static CallTarget createCallTarget(PythonBinaryClinicBuiltinNode node) {`
`182`		`- return Truffle.getRuntime().createCallTarget(new BinaryBuiltinRoot(node));`
	`181`	`+ return new BinaryBuiltinRoot(node).getCallTarget();`
`183`	`182`	`}`
`184`	`183`
`185`	`184`	`private static final class BinaryBuiltinRoot extends RootNode {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@`
`46`	`46`	`import com.oracle.graal.python.runtime.exception.PException;`
`47`	`47`	`import com.oracle.graal.python.runtime.object.PythonObjectFactory;`
`48`	`48`	`import com.oracle.graal.python.test.PythonTests;`
`49`		`-import com.oracle.truffle.api.Truffle;`
`50`	`49`	`import com.oracle.truffle.api.frame.VirtualFrame;`
`51`	`50`	`import com.oracle.truffle.api.nodes.RootNode;`
`52`	`51`	`import org.junit.After;`
`@@ -145,35 +144,35 @@ private static void expect(PythonBuiltinClassType errorType, Runnable test) {`
`145`	`144`	`}`
`146`	`145`
`147`	`146`	`private static long castInt(int arg) {`
`148`		`- return (Long) Truffle.getRuntime().createCallTarget(new RootNode(null) {`
	`147`	`+ return (Long) new RootNode(null) {`
`149`	`148`	`@Child private CastToJavaUnsignedLongNode castNode = CastToJavaUnsignedLongNode.create();`
`150`	`149`
`151`	`150`	`@Override`
`152`	`151`	`public Object execute(VirtualFrame frame) {`
`153`	`152`	`return castNode.execute(arg);`
`154`	`153`	`}`
`155`		`- }).call();`
	`154`	`+ }.getCallTarget().call();`
`156`	`155`	`}`
`157`	`156`
`158`	`157`	`private static long castLong(long arg) {`
`159`		`- return (Long) Truffle.getRuntime().createCallTarget(new RootNode(null) {`
	`158`	`+ return (Long) new RootNode(null) {`
`160`	`159`	`@Child private CastToJavaUnsignedLongNode castNode = CastToJavaUnsignedLongNode.create();`
`161`	`160`
`162`	`161`	`@Override`
`163`	`162`	`public Object execute(VirtualFrame frame) {`
`164`	`163`	`return castNode.execute(arg);`
`165`	`164`	`}`
`166`		`- }).call();`
	`165`	`+ }.getCallTarget().call();`
`167`	`166`	`}`
`168`	`167`
`169`	`168`	`private static long castObject(Object arg) {`
`170`		`- return (Long) Truffle.getRuntime().createCallTarget(new RootNode(null) {`
	`169`	`+ return (Long) new RootNode(null) {`
`171`	`170`	`@Child private CastToJavaUnsignedLongNode castNode = CastToJavaUnsignedLongNode.create();`
`172`	`171`
`173`	`172`	`@Override`
`174`	`173`	`public Object execute(VirtualFrame frame) {`
`175`	`174`	`return castNode.execute(arg);`
`176`	`175`	`}`
`177`		`- }).call();`
	`176`	`+ }.getCallTarget().call();`
`178`	`177`	`}`
`179`	`178`	`}`