[GR-33173] Migrate to new context reference API

PullRequest: graalpython/1941

Author: ppisl

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "61fd7e543d7aec3ee0f034e1405fe587056ee001" }
+{ "overlay": "e385509fa2da9be1056c7c165f19023c06f7600e" }

graalpython/com.oracle.graal.python.benchmarks/java/com/oracle/graal/python/benchmarks/parser/Deserializing.java

@@ -76,7 +76,7 @@ public void setup() {
     public void execute(Blackhole bh) {
         for (int n = 0; n < parsingCycles; n++) {
             for (Item serialization : serializations) {
-                bh.consume(parser.deserialize(serialization.data));
+                bh.consume(parser.deserialize(core, serialization.data));
             }
         }
     }

graalpython/com.oracle.graal.python.benchmarks/java/com/oracle/graal/python/benchmarks/parser/ParserBenchRunner.java

@@ -106,7 +106,7 @@ public ParserBenchRunner() {
         context.initialize("python");
         context.enter();
 
-        this.pyContext = PythonLanguage.getContext();
+        this.pyContext = PythonContext.get(null);
         this.parser = (PythonParserImpl) pyContext.getCore().getParser();
         this.core = pyContext.getCore();
     }
@@ -179,7 +179,7 @@ private List<Source> createSources() {
         }
         File file;
         PythonFileFilter filter = new PythonFileFilter(recursion, excludedPaths);
-        PythonContext pyContext = PythonLanguage.getContext();
+        PythonContext pyContext = PythonContext.get(null);
         for (String path : paths) {
             file = new File(path);
             if (file.isDirectory() || filter.accept(file)) {

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/WithPythonContextRule.java

@@ -40,8 +40,6 @@
  */
 package com.oracle.graal.python;
 
-import static com.oracle.graal.python.PythonLanguage.getContext;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -95,7 +93,7 @@ public void evaluate() throws Throwable {
                 RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(new RootNode(null) {
                     @Override
                     public Object execute(VirtualFrame frame) {
-                        pythonContext = getContext();
+                        pythonContext = PythonContext.get(this);
                         try {
                             base.evaluate();
                         } catch (Throwable e) {

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/builtins/modules/ConversionNodeTests.java

@@ -66,8 +66,8 @@ public class ConversionNodeTests {
     @Rule public ExpectedException expectedException = ExpectedException.none();
 
     protected static Object call(Object arg, ArgumentCastNodeWithRaise castNode) {
-        PythonLanguage language = PythonLanguage.getCurrent();
-        final PythonContext pythonContext = PythonLanguage.getContext();
+        PythonLanguage language = PythonLanguage.get(castNode);
+        final PythonContext pythonContext = PythonContext.get(castNode);
 
         RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(new PRootNode(language) {
             @Child private CalleeContext calleeContext = CalleeContext.create();

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/builtins/modules/DirFdConversionNodeTests.java

@@ -40,7 +40,6 @@
  */
 package com.oracle.graal.python.builtins.modules;
 
-import static com.oracle.graal.python.PythonLanguage.getContext;
 import static com.oracle.graal.python.runtime.PosixConstants.AT_FDCWD;
 
 import java.math.BigInteger;
@@ -53,6 +52,7 @@
 import org.junit.Test;
 
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.test.PythonTests;
 
@@ -158,6 +158,6 @@ private static PythonObjectFactory factory() {
     }
 
     private static Object evalValue(String source) {
-        return getContext().getEnv().asGuestValue(Context.getCurrent().eval("python", source));
+        return PythonContext.get(null).getEnv().asGuestValue(Context.getCurrent().eval("python", source));
     }
 }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/builtins/modules/FileDescriptorConversionNodeTests.java

@@ -40,7 +40,6 @@
  */
 package com.oracle.graal.python.builtins.modules;
 
-import static com.oracle.graal.python.PythonLanguage.getContext;
 import static com.oracle.graal.python.runtime.PosixConstants.AT_FDCWD;
 
 import java.math.BigInteger;
@@ -53,6 +52,7 @@
 import org.junit.Test;
 
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.test.PythonTests;
 
@@ -166,6 +166,6 @@ private static PythonObjectFactory factory() {
     }
 
     private static Object evalValue(String source) {
-        return getContext().getEnv().asGuestValue(Context.getCurrent().eval("python", source));
+        return PythonContext.get(null).getEnv().asGuestValue(Context.getCurrent().eval("python", source));
     }
 }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/builtins/modules/PathConversionNodeTests.java

@@ -40,8 +40,6 @@
  */
 package com.oracle.graal.python.builtins.modules;
 
-import static com.oracle.graal.python.PythonLanguage.getContext;
-
 import java.math.BigInteger;
 import java.util.Collections;
 
@@ -61,6 +59,7 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.runtime.PosixSupportLibrary.Buffer;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.test.PythonTests;
 import com.oracle.graal.python.util.Function;
@@ -355,6 +354,6 @@ private static PythonObjectFactory factory() {
     }
 
     private static Object evalValue(String source) {
-        return getContext().getEnv().asGuestValue(Context.getCurrent().eval("python", source));
+        return PythonContext.get(null).getEnv().asGuestValue(Context.getCurrent().eval("python", source));
     }
 }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/PythonTests.java

@@ -294,7 +294,7 @@ private static String getFileContent(File file) {
     public static RootNode getParseResult(com.oracle.truffle.api.source.Source source, PrintStream out, PrintStream err) {
         enterContext();
         try {
-            PythonContext ctx = PythonLanguage.getContext();
+            PythonContext ctx = PythonContext.get(null);
             ctx.setOut(out);
             ctx.setErr(err);
             return (RootNode) ctx.getCore().getParser().parse(ParserMode.File, 0, ctx.getCore(), source, null, null);

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/datatype/PRangeTests.java

@@ -64,9 +64,10 @@ public void doInsert(Node child) {
     public void loopWithOnlyStop() throws UnexpectedResultException {
         PythonTests.enterContext();
         try {
-            PRange range = PythonObjectFactory.getUncached().createIntRange(10);
+            PythonObjectFactory factory = PythonObjectFactory.getUncached();
+            PRange range = factory.createIntRange(10);
             int index = 0;
-            TestRoot testRoot = new TestRoot(PythonLanguage.getCurrent());
+            TestRoot testRoot = new TestRoot(PythonLanguage.get(factory));
             Object iter = PythonObjectLibrary.getUncached().getIterator(range);
             GetNextNode next = GetNextNode.create();
             testRoot.doInsert(next);
@@ -91,9 +92,10 @@ public void loopWithOnlyStop() throws UnexpectedResultException {
     public void loopWithStep() throws UnexpectedResultException {
         PythonTests.enterContext();
         try {
+            PythonObjectFactory factory = PythonObjectFactory.getUncached();
             PRange range = PythonObjectFactory.getUncached().createIntRange(0, 10, 2, 5);
             int index = 0;
-            TestRoot testRoot = new TestRoot(PythonLanguage.getCurrent());
+            TestRoot testRoot = new TestRoot(PythonLanguage.get(factory));
             Object iter = PythonObjectLibrary.getUncached().getIterator(range);
             GetNextNode next = GetNextNode.create();
             testRoot.doInsert(next);