Alter isolate API to handle edge cases properly.

Author: aardvark179

rhino-engine/src/main/java/org/mozilla/javascript/engine/RhinoScriptEngine.java

@@ -97,13 +97,14 @@ private Scriptable initScope(Context cx, ScriptContext sc) throws ScriptExceptio
 
         if (sc.getBindings(ScriptContext.GLOBAL_SCOPE) != null) {
             var globalScope =
-                    topLevelScope.createIsolate(
+                    TopLevel.createIsolate(
+                            topLevelScope,
                             new BindingsObject(sc.getBindings(ScriptContext.GLOBAL_SCOPE)));
-            return globalScope.createIsolate(
-                    new BindingsObject(sc.getBindings(ScriptContext.ENGINE_SCOPE)));
+            return TopLevel.createIsolate(
+                    globalScope, new BindingsObject(sc.getBindings(ScriptContext.ENGINE_SCOPE)));
         } else {
-            return topLevelScope.createIsolate(
-                    new BindingsObject(sc.getBindings(ScriptContext.ENGINE_SCOPE)));
+            return TopLevel.createIsolate(
+                    topLevelScope, new BindingsObject(sc.getBindings(ScriptContext.ENGINE_SCOPE)));
         }
     }
 

rhino/src/main/java/org/mozilla/javascript/ImporterTopLevel.java

@@ -116,6 +116,11 @@ public ImporterTopLevel(Context cx, boolean sealed) {
         initStandardObjects(cx, sealed);
     }
 
+    private ImporterTopLevel(ScriptableObject scope) {
+        super(scope);
+        topScopeFlag = true;
+    }
+
     @Override
     public String getClassName() {
         return topScopeFlag ? "global" : "JavaImporter";
@@ -275,6 +280,19 @@ public ImporterGlobalThis getGlobalThis() {
         return (ImporterGlobalThis) super.getGlobalThis();
     }
 
+    public static TopLevel createIsolate(Context cx, TopLevel parent) {
+        var newGlobal = new ImporterGlobalThis(true);
+        newGlobal.setPrototype(parent.getGlobalThis());
+        newGlobal.setParentScope(null);
+        newGlobal.put("globalThis", newGlobal, newGlobal);
+        newGlobal.setAttributes("globalThis", ScriptableObject.DONTENUM);
+        var isolate = new ImporterTopLevel(newGlobal);
+        isolate.copyAssociatedValue(parent);
+        isolate.copyBuiltins(parent, false);
+        ImporterTopLevel.init(cx, isolate, false, true);
+        return isolate;
+    }
+
     private static final String AKEY = "importedPackages";
     private final boolean topScopeFlag;
 }

rhino/src/main/java/org/mozilla/javascript/TopLevel.java

@@ -131,22 +131,22 @@ public TopLevel(ScriptableObject customGlobal) {
         globalThis = customGlobal;
     }
 
-    public TopLevel createIsolate() {
+    public static TopLevel createIsolate(TopLevel parent) {
         var newGlobal = new NativeObject();
-        newGlobal.setPrototype(getGlobalThis());
+        newGlobal.setPrototype(parent.getGlobalThis());
         newGlobal.setParentScope(null);
         var isolate = new TopLevel(newGlobal);
-        isolate.copyAssociatedValue(this);
-        isolate.copyBuiltins(this, false);
+        isolate.copyAssociatedValue(parent);
+        isolate.copyBuiltins(parent, false);
         return isolate;
     }
 
-    public TopLevel createIsolate(ScriptableObject customGlobal) {
+    public static TopLevel createIsolate(TopLevel parent, ScriptableObject customGlobal) {
         customGlobal.setParentScope(null);
-        customGlobal.setPrototype(getGlobalThis());
+        customGlobal.setPrototype(parent.getGlobalThis());
         var isolate = new TopLevel(customGlobal);
-        isolate.copyAssociatedValue(this);
-        isolate.copyBuiltins(this, false);
+        isolate.copyAssociatedValue(parent);
+        isolate.copyBuiltins(parent, false);
         return isolate;
     }
 
@@ -155,11 +155,12 @@ public TopLevel createIsolate(ScriptableObject customGlobal) {
      * this top level's global object. This should only be done if you know for certain that no
      * other use will be made of this prototype chain.
      */
-    public TopLevel createIsolateCustomPrototypeChain(ScriptableObject customGlobal) {
+    public static TopLevel createIsolateCustomPrototypeChain(
+            TopLevel parent, ScriptableObject customGlobal) {
         customGlobal.setParentScope(null);
         var isolate = new TopLevel(customGlobal);
-        isolate.copyAssociatedValue(this);
-        isolate.copyBuiltins(this, false);
+        isolate.copyAssociatedValue(parent);
+        isolate.copyBuiltins(parent, false);
         return isolate;
     }
 

rhino/src/test/java/org/mozilla/javascript/tests/DynamicScopeTest.java

@@ -113,7 +113,7 @@ public void standardMethodObjectCreate() {
                                     "source2",
                                     1,
                                     null);
-            var newTopLevel = someScope.createIsolate((ScriptableObject) subScope);
+            var newTopLevel = TopLevel.createIsolate(someScope, (ScriptableObject) subScope);
 
             Scriptable subObj =
                     (Scriptable)

tests/src/test/java/org/mozilla/javascript/drivers/ScriptTestsBase.java

@@ -24,6 +24,7 @@
 import org.mozilla.javascript.ScriptRuntime;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.TopLevel;
 import org.mozilla.javascript.Undefined;
 import org.mozilla.javascript.tools.shell.Global;
 
@@ -71,7 +72,7 @@ private Object executeRhinoScript(boolean interpretedMode) {
             Global global = new Global(cx);
             loadNatives(global);
 
-            var scope = global.createIsolate();
+            var scope = TopLevel.createIsolate(global);
 
             return cx.evaluateReader(scope, script, suiteName, 1, null);
         } catch (JavaScriptException ex) {

tests/src/test/java/org/mozilla/javascript/tests/ImportClassTest.java

@@ -17,8 +17,7 @@
 import org.mozilla.javascript.ImporterTopLevel;
 import org.mozilla.javascript.NativeJavaClass;
 import org.mozilla.javascript.Script;
-import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.TopLevel;
 import org.mozilla.javascript.UniqueTag;
 import org.mozilla.javascript.drivers.TestUtils;
 import org.mozilla.javascript.testutils.Utils;
@@ -80,18 +79,16 @@ public void importInSameContext() {
     public void importMultipleTimes() {
         Utils.runWithAllModes(
                 cx -> {
-                    ScriptableObject sharedScope = cx.initStandardObjects();
+                    TopLevel sharedScope = cx.initStandardObjects();
                     // sharedScope.sealObject(); // code below will try to modify sealed object
 
                     Script script =
                             cx.compileString(
                                     "importClass(java.util.UUID);true", "TestScript", 1, null);
 
                     for (int i = 0; i < 3; i++) {
-                        Scriptable scope = new ImporterTopLevel(cx);
-                        scope.setPrototype(sharedScope);
-                        scope.setParentScope(null);
-                        script.exec(cx, scope, scope);
+                        var scope = ImporterTopLevel.createIsolate(cx, sharedScope);
+                        script.exec(cx, scope, scope.getGlobalThis());
                         assertEquals(UniqueTag.NOT_FOUND, sharedScope.get("UUID", sharedScope));
                         assertTrue(scope.get("UUID", scope) instanceof NativeJavaClass);
                     }

tests/src/test/java/org/mozilla/javascript/tests/NestedContextPrototypeTest.java

@@ -106,7 +106,7 @@ private Object runScript(String scriptSourceText) {
                                     scope = context.newObject(global);
                                     break;
                                 case SEALED:
-                                    scope = global.createIsolate();
+                                    scope = TopLevel.createIsolate(global);
                                     break;
                                 case SEALED_OWN_OBJECTS:
                                     scope = context.initStandardObjects(new TopLevel());

tests/src/test/java/org/mozilla/javascript/tests/SealedSharedScopeTest.java

@@ -22,6 +22,7 @@
 import org.mozilla.javascript.IdFunctionObject;
 import org.mozilla.javascript.ImporterTopLevel;
 import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.TopLevel;
 import org.mozilla.javascript.Wrapper;
 
 @RunWith(BlockJUnit4ClassRunner.class)
@@ -41,8 +42,8 @@ public void setUp() throws Exception {
 
         ctx = Context.enter();
         ctx.setLanguageVersion(Context.VERSION_DEFAULT);
-        scope1 = sharedScope.createIsolate();
-        scope2 = sharedScope.createIsolate();
+        scope1 = TopLevel.createIsolate(sharedScope);
+        scope2 = TopLevel.createIsolate(sharedScope);
     }
 
     @After

tests/src/test/java/org/mozilla/javascript/tests/commonjs/module/RequireTest.java

@@ -81,7 +81,8 @@ public void customGlobal() throws Exception {
 
             var obj = cx.newObject(scope, "CustomGlobal", null);
             obj.getPrototype().setPrototype(scope.getGlobalThis());
-            final TopLevel global = scope.createIsolateCustomPrototypeChain((ScriptableObject) obj);
+            final TopLevel global =
+                    TopLevel.createIsolateCustomPrototypeChain(scope, (ScriptableObject) obj);
 
             final Require require =
                     new Require(