Small tidy up.

Author: aardvark179

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

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

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

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

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

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

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

@@ -190,7 +190,6 @@ public static TopLevel initSafeStandardObjects(Context cx, TopLevel scope, boole
         scope.clearCache();
 
         scope.associateValue(LIBRARY_SCOPE_KEY, scope);
-        scope.getGlobalThis().associateValue(LIBRARY_SCOPE_KEY, scope);
 
         new ClassCache().associate(scope);
         new ConcurrentFactory().associate(scope);

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

@@ -2974,35 +2974,7 @@ protected void copyAssociatedValue(ScriptableObject other) {
      */
     public static Object getTopScopeValue(Scriptable scope, Object key) {
         var topScope = ScriptableObject.getTopLevelScope(scope);
-        Object value = topScope.getAssociatedValue(key);
-        if (value != null) {
-            return value;
-        }
-        return null;
-    }
-
-    public static Object getTopScopeValueOrElse(Scriptable scope, Object key, Object elseValue) {
-        TopLevel topScope;
-        Scriptable obj = scope;
-        for (; ; ) {
-            Scriptable parent = obj.getParentScope();
-            if (parent == null) {
-                if (obj instanceof TopLevel) {
-                    topScope = (TopLevel) obj;
-                } else {
-                    topScope = null;
-                }
-                break;
-            }
-            obj = parent;
-        }
-        if (topScope != null) {
-            Object value = topScope.getAssociatedValue(key);
-            if (value != null) {
-                return value;
-            }
-        }
-        return elseValue;
+        return topScope.getAssociatedValue(key);
     }
 
     /**

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

@@ -396,9 +396,7 @@ static TypeInfoFactory get(Scriptable scope) {
      * @see #associate(ScriptableObject topScope)
      */
     static TypeInfoFactory getOrElse(Scriptable scope, TypeInfoFactory fallback) {
-        var got =
-                (TypeInfoFactory)
-                        ScriptableObject.getTopScopeValueOrElse(scope, "TypeInfoFactory", fallback);
+        var got = (TypeInfoFactory) ScriptableObject.getTopScopeValue(scope, "TypeInfoFactory");
         if (got == null) {
             return fallback;
         }