Associate internal values with globalThis so isolates can find them.

Author: aardvark179

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

@@ -31,6 +31,9 @@ static ES6Generator init(ScriptableObject scope, boolean sealed) {
         // approach instead.
         if (scope != null) {
             scope.associateValue(GENERATOR_TAG, prototype);
+            if (scope instanceof TopLevel) {
+                ((TopLevel) scope).getGlobalThis().associateValue(GENERATOR_TAG, prototype);
+            }
         }
 
         return prototype;

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

@@ -27,6 +27,9 @@ protected static void init(
         // approach instead.
         if (scope != null) {
             scope.associateValue(tag, prototype);
+            if (scope instanceof TopLevel) {
+                ((TopLevel) scope).getGlobalThis().associateValue(tag, prototype);
+            }
         }
     }
 

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

@@ -38,6 +38,9 @@ static NativeGenerator init(ScriptableObject scope, boolean sealed) {
         // approach instead.
         if (scope != null) {
             scope.associateValue(GENERATOR_TAG, prototype);
+            if (scope instanceof TopLevel) {
+                ((TopLevel) scope).getGlobalThis().associateValue(GENERATOR_TAG, prototype);
+            }
         }
 
         return prototype;

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

@@ -42,6 +42,9 @@ static void init(Context cx, ScriptableObject scope, boolean sealed) {
         // throw StopIteration even if the property of the global
         // scope is replaced or deleted.
         scope.associateValue(ITERATOR_TAG, obj);
+        if (scope instanceof TopLevel) {
+            ((TopLevel) scope).getGlobalThis().associateValue(ITERATOR_TAG, obj);
+        }
     }
 
     /** Only for constructing the prototype object. */

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

@@ -191,6 +191,10 @@ public static ScriptableObject initSafeStandardObjects(
         }
 
         scope.associateValue(LIBRARY_SCOPE_KEY, scope);
+        if (scope instanceof TopLevel) {
+            ((TopLevel) scope).getGlobalThis().associateValue(LIBRARY_SCOPE_KEY, scope);
+        }
+
         new ClassCache().associate(scope);
         new ConcurrentFactory().associate(scope);
 

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

@@ -2945,6 +2945,16 @@ public final Object getAssociatedValue(Object key) {
      */
     public static Object getTopScopeValue(Scriptable scope, Object key) {
         scope = ScriptableObject.getTopLevelScope(scope);
+        if (scope instanceof ScriptableObject) {
+            ScriptableObject so = (ScriptableObject) scope;
+            Object value = so.getAssociatedValue(key);
+            if (value != null) {
+                return value;
+            }
+        }
+        if (scope instanceof TopLevel) {
+            scope = ((TopLevel) scope).getGlobalThis();
+        }
         for (; ; ) {
             if (scope instanceof ScriptableObject) {
                 ScriptableObject so = (ScriptableObject) scope;

rhino/src/main/java/org/mozilla/javascript/lc/type/TypeInfoFactory.java

@@ -23,6 +23,7 @@
 import java.util.function.Supplier;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.TopLevel;
 import org.mozilla.javascript.lc.type.impl.factory.NoCacheFactory;
 import org.mozilla.javascript.lc.type.impl.factory.WeakReferenceFactory;
 
@@ -365,6 +366,9 @@ default TypeInfoFactory associate(ScriptableObject topScope) {
         if (topScope.getParentScope() != null) {
             throw new IllegalArgumentException("provided scope not top scope");
         }
+        if (topScope instanceof TopLevel) {
+            topScope = ((TopLevel) topScope).getGlobalThis();
+        }
         return (TypeInfoFactory) topScope.associateValue("TypeInfoFactory", this);
     }