[GR-22732] Migrate deprecated TruffleContext.enter/leave.

woess · woess · commit 749145e8d267 · 2020-10-21T16:46:05.000Z
PullRequest: js/1728
diff --git a/graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/polyglot/InnerContextTest.java b/graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/polyglot/InnerContextTest.java
@@ -85,13 +85,13 @@ public Object execute(VirtualFrame frame) {
                     private Object innerJS() {
                         TruffleLanguage.Env env = TruffleLanguage.getCurrentContext(TestLanguage.class).getEnv();
                         TruffleContext innerContext = env.newContextBuilder().build();
-                        Object prev = innerContext.enter();
+                        Object prev = innerContext.enter(this);
                         try {
                             TruffleLanguage.Env innerEnv = TruffleLanguage.getCurrentContext(TestLanguage.class).getEnv();
                             CallTarget answer = innerEnv.parsePublic(com.oracle.truffle.api.source.Source.newBuilder(JavaScriptLanguage.ID, "42", "test.js").build());
                             return answer.call();
                         } finally {
-                            innerContext.leave(prev);
+                            innerContext.leave(this, prev);
                         }
                     }
                 });
@@ -123,7 +123,7 @@ public Object execute(VirtualFrame frame) {
                     private Object innerJS() {
                         TruffleLanguage.Env env = TruffleLanguage.getCurrentContext(TestLanguage.class).getEnv();
                         TruffleContext innerContext = env.newContextBuilder().build();
-                        Object prev = innerContext.enter();
+                        Object prev = innerContext.enter(this);
                         try {
                             TruffleLanguage.Env innerEnv = TruffleLanguage.getCurrentContext(TestLanguage.class).getEnv();
                             String jsCode = "b + s + i + l + f + d + c + str";
@@ -132,7 +132,7 @@ private Object innerJS() {
                             CallTarget answer = innerEnv.parsePublic(source, "b", "s", "i", "l", "f", "d", "c", "str");
                             return answer.call((byte) 1, (short) 2, 3, 4L, 0.1f, 1.5, ':', "test");
                         } finally {
-                            innerContext.leave(prev);
+                            innerContext.leave(this, prev);
                         }
                     }
                 });
diff --git a/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/GlobalBuiltins.java b/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/GlobalBuiltins.java
@@ -1447,15 +1447,15 @@ protected Object evalImpl(JSRealm realm, String fileName, String source, Object[
         protected Object loadFromPath(String path, JSRealm realm, Object[] args) {
             JSRealm childRealm = realm.createChildRealm();
             TruffleContext childContext = childRealm.getTruffleContext();
-            Object prev = childContext.enter();
+            Object prev = childContext.enter(this);
             try {
                 DynamicObject argObj = JSArgumentsArray.createStrictSlow(childRealm, args);
                 // TODO: should be a child realm array
                 JSRuntime.createDataProperty(childRealm.getGlobalObject(), JSFunction.ARGUMENTS, argObj);
                 Source source = sourceFromPath(path, childRealm);
                 return runImpl(childRealm, source);
             } finally {
-                childContext.leave(prev);
+                childContext.leave(this, prev);
             }
         }
     }
diff --git a/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/control/AsyncFunctionBodyNode.java b/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/control/AsyncFunctionBodyNode.java
@@ -134,7 +134,7 @@ public Object execute(VirtualFrame frame) {
 
             if (enterContext) {
                 childContext = realm.getTruffleContext();
-                prev = childContext.enter();
+                prev = childContext.enter(this);
             }
 
             try {
@@ -151,7 +151,7 @@ public Object execute(VirtualFrame frame) {
                 }
             } finally {
                 if (enterContext) {
-                    childContext.leave(prev);
+                    childContext.leave(this, prev);
                 }
             }
             // The result is undefined for normal completion.
diff --git a/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JSAgent.java b/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JSAgent.java
@@ -158,11 +158,11 @@ public final void processAllPromises(boolean processWeakRefs) {
                 DynamicObject nextJob = promiseJobsQueue.pollLast();
                 if (JSFunction.isJSFunction(nextJob)) {
                     JSRealm functionRealm = JSFunction.getRealm(nextJob);
-                    Object prev = functionRealm.getTruffleContext().enter();
+                    Object prev = functionRealm.getTruffleContext().enter(null);
                     try {
                         JSFunction.call(nextJob, Undefined.instance, JSArguments.EMPTY_ARGUMENTS_ARRAY);
                     } finally {
-                        functionRealm.getTruffleContext().leave(prev);
+                        functionRealm.getTruffleContext().leave(null, prev);
                     }
                 }
             }
diff --git a/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JSRealm.java b/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JSRealm.java
@@ -1856,7 +1856,7 @@ public JSRealm createChildRealm() {
         CREATING_CHILD_REALM.set(Boolean.TRUE);
         try {
             TruffleContext nestedContext = getEnv().newContextBuilder().build();
-            Object prev = nestedContext.enter();
+            Object prev = nestedContext.enter(null);
             try {
                 JSRealm childRealm = JavaScriptLanguage.getCurrentJSRealm();
                 childRealm.agent = this.agent;
@@ -1872,7 +1872,7 @@ public JSRealm createChildRealm() {
 
                 return childRealm;
             } finally {
-                nestedContext.leave(prev);
+                nestedContext.leave(null, prev);
             }
         } finally {
             CREATING_CHILD_REALM.set(Boolean.FALSE);
diff --git a/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JavaScriptRealmBoundaryRootNode.java b/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JavaScriptRealmBoundaryRootNode.java
@@ -87,7 +87,7 @@ public final Object execute(VirtualFrame frame) {
 
         if (enterContext) {
             childContext = realm.getTruffleContext();
-            prev = childContext.enter();
+            prev = childContext.enter(this);
         }
         try {
             return executeInRealm(frame);
@@ -109,7 +109,7 @@ public final Object execute(VirtualFrame frame) {
             throw Errors.createRangeErrorStackOverflow(this);
         } finally {
             if (enterContext) {
-                childContext.leave(prev);
+                childContext.leave(this, prev);
             }
         }
     }
diff --git a/graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/com/oracle/truffle/trufflenode/GraalJSAccess.java b/graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/com/oracle/truffle/trufflenode/GraalJSAccess.java
@@ -1964,7 +1964,7 @@ public Object scriptRun(Object script) {
         }
         JSRealm realm = boundScript.getRealm();
         Object[] arguments = scriptNode.argumentsToRun(realm);
-        Object prev = realm.getTruffleContext().enter();
+        Object prev = realm.getTruffleContext().enter(null);
         try {
             Object result;
             if (boundScript.isGraalInternal()) {
@@ -1974,7 +1974,7 @@ public Object scriptRun(Object script) {
             }
             return result;
         } finally {
-            realm.getTruffleContext().leave(prev);
+            realm.getTruffleContext().leave(null, prev);
         }
     }
 
@@ -2092,11 +2092,11 @@ public Object unboundScriptBindToContext(Object context, Object script) {
             if (scriptNode == null) {
                 JSParserOptions options = jsContext.getParserOptions();
                 NodeFactory factory = NodeFactory.getInstance(jsContext);
-                Object prev = jsRealm.getTruffleContext().enter();
+                Object prev = jsRealm.getTruffleContext().enter(null);
                 try {
                     scriptNode = JavaScriptTranslator.translateFunction(factory, jsContext, null, source, options.isStrict(), (FunctionNode) parseResult);
                 } finally {
-                    jsRealm.getTruffleContext().leave(prev);
+                    jsRealm.getTruffleContext().leave(null, prev);
                 }
                 if (!"repl".equals(source.getName())) {
                     contextData.getScriptNodeCache().put(source, scriptNode);
@@ -2904,7 +2904,7 @@ public void isolateEnter(long isolate) {
             list = new LinkedList<>();
             isolateStack.set(list);
         }
-        Object previous = mainJSRealm.getTruffleContext().enter();
+        Object previous = mainJSRealm.getTruffleContext().enter(null);
         if (list.isEmpty()) {
             agent.setThread(Thread.currentThread());
         }
@@ -2915,7 +2915,7 @@ public long isolateExit(long isolate) {
         Deque<Pair<Long, Object>> list = isolateStack.get();
         Pair<Long, Object> pair = list.pop();
         assert pair.getFirst() == isolate;
-        mainJSRealm.getTruffleContext().leave(pair.getSecond());
+        mainJSRealm.getTruffleContext().leave(null, pair.getSecond());
         if (list.isEmpty()) {
             agent.setThread(null);
             return 0;

Original file line number	Diff line number	Diff line change
`@@ -1447,15 +1447,15 @@ protected Object evalImpl(JSRealm realm, String fileName, String source, Object[`
`1447`	`1447`	`protected Object loadFromPath(String path, JSRealm realm, Object[] args) {`
`1448`	`1448`	`JSRealm childRealm = realm.createChildRealm();`
`1449`	`1449`	`TruffleContext childContext = childRealm.getTruffleContext();`
`1450`		`- Object prev = childContext.enter();`
	`1450`	`+ Object prev = childContext.enter(this);`
`1451`	`1451`	`try {`
`1452`	`1452`	`DynamicObject argObj = JSArgumentsArray.createStrictSlow(childRealm, args);`
`1453`	`1453`	`// TODO: should be a child realm array`
`1454`	`1454`	`JSRuntime.createDataProperty(childRealm.getGlobalObject(), JSFunction.ARGUMENTS, argObj);`
`1455`	`1455`	`Source source = sourceFromPath(path, childRealm);`
`1456`	`1456`	`return runImpl(childRealm, source);`
`1457`	`1457`	`} finally {`
`1458`		`- childContext.leave(prev);`
	`1458`	`+ childContext.leave(this, prev);`
`1459`	`1459`	`}`
`1460`	`1460`	`}`
`1461`	`1461`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public Object execute(VirtualFrame frame) {`
`134`	`134`
`135`	`135`	`if (enterContext) {`
`136`	`136`	`childContext = realm.getTruffleContext();`
`137`		`- prev = childContext.enter();`
	`137`	`+ prev = childContext.enter(this);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`try {`
`@@ -151,7 +151,7 @@ public Object execute(VirtualFrame frame) {`
`151`	`151`	`}`
`152`	`152`	`} finally {`
`153`	`153`	`if (enterContext) {`
`154`		`- childContext.leave(prev);`
	`154`	`+ childContext.leave(this, prev);`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`// The result is undefined for normal completion.`
Original file line number	Diff line number	Diff line change
`@@ -158,11 +158,11 @@ public final void processAllPromises(boolean processWeakRefs) {`
`158`	`158`	`DynamicObject nextJob = promiseJobsQueue.pollLast();`
`159`	`159`	`if (JSFunction.isJSFunction(nextJob)) {`
`160`	`160`	`JSRealm functionRealm = JSFunction.getRealm(nextJob);`
`161`		`- Object prev = functionRealm.getTruffleContext().enter();`
	`161`	`+ Object prev = functionRealm.getTruffleContext().enter(null);`
`162`	`162`	`try {`
`163`	`163`	`JSFunction.call(nextJob, Undefined.instance, JSArguments.EMPTY_ARGUMENTS_ARRAY);`
`164`	`164`	`} finally {`
`165`		`- functionRealm.getTruffleContext().leave(prev);`
	`165`	`+ functionRealm.getTruffleContext().leave(null, prev);`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public final Object execute(VirtualFrame frame) {`
`87`	`87`
`88`	`88`	`if (enterContext) {`
`89`	`89`	`childContext = realm.getTruffleContext();`
`90`		`- prev = childContext.enter();`
	`90`	`+ prev = childContext.enter(this);`
`91`	`91`	`}`
`92`	`92`	`try {`
`93`	`93`	`return executeInRealm(frame);`
`@@ -109,7 +109,7 @@ public final Object execute(VirtualFrame frame) {`
`109`	`109`	`throw Errors.createRangeErrorStackOverflow(this);`
`110`	`110`	`} finally {`
`111`	`111`	`if (enterContext) {`
`112`		`- childContext.leave(prev);`
	`112`	`+ childContext.leave(this, prev);`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`}`