[GR-35922] Backport: CompileFunctionInContext() should create the fun…

…ction in the right context. PullRequest: js/2274
oracle · Dec 21, 2021 · 81a5372 · 81a5372
2 parents c173cf9 + b6f1e97
commit 81a5372
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/...dejs/com.oracle.truffle.trufflenode/src/com/oracle/truffle/trufflenode/GraalJSAccess.java b/...dejs/com.oracle.truffle.trufflenode/src/com/oracle/truffle/trufflenode/GraalJSAccess.java
@@ -2186,9 +2186,15 @@ public Object scriptCompilerCompileFunctionInContext(Object context, String sour
                             suffix,
                             String.valueOf(isStrict)
             };
-            CallTarget target = realm.getEnv().parsePublic(source, args);
-            DynamicObject script = (DynamicObject) target.call();
-            function = anyExtension ? JSFunction.call(script, Undefined.instance, extensions) : script;
+            JSRealm mainRealm = JSRealm.getMain(null);
+            JSRealm prevRealm = mainRealm.enterRealm(null, realm);
+            try {
+                CallTarget target = realm.getEnv().parsePublic(source, args);
+                DynamicObject script = (DynamicObject) target.call();
+                function = anyExtension ? JSFunction.call(script, Undefined.instance, extensions) : script;
+            } finally {
+                mainRealm.leaveRealm(null, prevRealm);
+            }
         }
         assert JSFunction.isJSFunction(function);
 

diff --git a/graal-nodejs/test/graal/unit/vm.js b/graal-nodejs/test/graal/unit/vm.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -88,4 +88,12 @@ describe('vm', function () {
         }, SyntaxError);
         assert.strictEqual(new vm.Script('6*7', { filename: 'vm.js' }).runInThisContext(), 42);
     });
+    it('should honor parsingContext option of compileFunction()', function () {
+        // Extracted from parallel/test-vm-basic.js.
+        // Similar pattern is used by jest testing framework.
+        assert.strictEqual(
+            vm.compileFunction('return varInContext', [], { parsingContext: vm.createContext({varInContext: 'abc'}) })(),
+            'abc'
+        );
+    });
 });