It is no longer needed to maintain a map of aliases for global variables

* Since the GlobalVariableStorage can be invalidated and looked up again.

Author: eregon

src/main/java/org/truffleruby/language/globals/GlobalVariables.java

@@ -24,16 +24,11 @@ public class GlobalVariables {
 
     private final DynamicObject defaultValue;
     private final ConcurrentMap<String, GlobalVariableStorage> variables = new ConcurrentHashMap<>();
-    private final Map<String, String> aliases = new ConcurrentHashMap<>();
 
     public GlobalVariables(DynamicObject defaultValue) {
         this.defaultValue = defaultValue;
     }
 
-    private String getOriginalName(String name) {
-        return aliases.getOrDefault(name, name);
-    }
-
     /**
      * The returned storage must be checked if it is still valid with
      * {@link GlobalVariableStorage#getValidAssumption()}. A storage
@@ -42,8 +37,7 @@ private String getOriginalName(String name) {
      */
     @TruffleBoundary
     public GlobalVariableStorage getStorage(String name) {
-        final String originalName = getOriginalName(name);
-        return ConcurrentOperations.getOrCompute(variables, originalName,
+        return ConcurrentOperations.getOrCompute(variables, name,
                 k -> new GlobalVariableStorage(defaultValue, null, null, null));
     }
 
@@ -67,10 +61,6 @@ public GlobalVariableStorage put(String name, DynamicObject getter, DynamicObjec
 
     @TruffleBoundary
     public void alias(String oldName, String newName) {
-        // Record an alias of an alias against the original.
-        oldName = getOriginalName(oldName);
-        aliases.put(newName, oldName);
-
         final GlobalVariableStorage storage = getStorage(oldName);
 
         GlobalVariableStorage previousStorage;