Keep the name in ReadSimpleGlobalVariableNode and WriteSimpleGlobalVariableNode

* Enables looking up again the storage if needed.

Author: eregon

src/main/java/org/truffleruby/core/kernel/TruffleKernelNodes.java

@@ -11,6 +11,7 @@
 
 import java.io.IOException;
 
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
 import org.truffleruby.Layouts;
@@ -107,34 +108,28 @@ private RubySource loadFile(String feature) throws IOException {
 
     // Only used internally with a constant literal name, does not trigger hooks
     @Primitive(name = "global_variable_set")
+    @ImportStatic(Layouts.class)
     public abstract static class WriteGlobalVariableNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization(guards = { "isRubySymbol(cachedName)", "name == cachedName" }, limit = "1")
         public Object write(DynamicObject name, Object value,
                 @Cached("name") DynamicObject cachedName,
-                @Cached("create(getStorage(cachedName))") WriteSimpleGlobalVariableNode writeNode) {
+                @Cached("create(SYMBOL.getString(cachedName))") WriteSimpleGlobalVariableNode writeNode) {
             return writeNode.execute(value);
         }
-
-        protected GlobalVariableStorage getStorage(DynamicObject name) {
-            return coreLibrary().getGlobalVariables().getStorage(Layouts.SYMBOL.getString(name));
-        }
     }
 
     // Only used internally with a constant literal name, does not trigger hooks
     @Primitive(name = "global_variable_get")
+    @ImportStatic(Layouts.class)
     public abstract static class ReadGlobalVariableNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization(guards = { "isRubySymbol(cachedName)", "name == cachedName" }, limit = "1")
         public Object read(DynamicObject name,
                 @Cached("name") DynamicObject cachedName,
-                @Cached("create(getStorage(cachedName))") ReadSimpleGlobalVariableNode readNode) {
+                @Cached("create(SYMBOL.getString(cachedName))") ReadSimpleGlobalVariableNode readNode) {
             return readNode.execute();
         }
-
-        protected GlobalVariableStorage getStorage(DynamicObject name) {
-            return coreLibrary().getGlobalVariables().getStorage(Layouts.SYMBOL.getString(name));
-        }
     }
 
     @CoreMethod(names = "define_hooked_variable_with_is_defined", isModuleFunction = true, required = 4)

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

@@ -21,16 +21,17 @@
 
 public abstract class ReadGlobalVariableNode extends RubyNode {
 
-    private final String name;
+    protected final String name;
     @Child private IsDefinedGlobalVariableNode definedNode;
 
     public ReadGlobalVariableNode(String name) {
         this.name = name;
     }
 
     @Specialization(guards = "storage.isSimple()")
-    public Object read(@Cached("getStorage()") GlobalVariableStorage storage,
-            @Cached("create(storage)") ReadSimpleGlobalVariableNode simpleNode) {
+    public Object read(
+            @Cached("getStorage()") GlobalVariableStorage storage,
+            @Cached("create(name)") ReadSimpleGlobalVariableNode simpleNode) {
         return simpleNode.execute();
     }
 

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

@@ -7,27 +7,33 @@
 
 public abstract class ReadSimpleGlobalVariableNode extends RubyBaseNode {
 
-    protected final GlobalVariableStorage storage;
+    protected final String name;
 
-    public static ReadSimpleGlobalVariableNode create(GlobalVariableStorage storage) {
-        return ReadSimpleGlobalVariableNodeGen.create(storage);
+    public static ReadSimpleGlobalVariableNode create(String name) {
+        return ReadSimpleGlobalVariableNodeGen.create(name);
     }
 
-    public ReadSimpleGlobalVariableNode(GlobalVariableStorage storage) {
-        this.storage = storage;
+    public ReadSimpleGlobalVariableNode(String name) {
+        this.name = name;
     }
 
     public abstract Object execute();
 
     @Specialization(assumptions = "storage.getUnchangedAssumption()")
     public Object readConstant(
+            @Cached("getStorage()") GlobalVariableStorage storage,
             @Cached("storage.getValue()") Object value) {
         return value;
     }
 
     @Specialization
-    public Object read() {
+    public Object read(
+            @Cached("getStorage()") GlobalVariableStorage storage) {
         return storage.getValue();
     }
 
+    protected GlobalVariableStorage getStorage() {
+        return coreLibrary().getGlobalVariables().getStorage(name);
+    }
+
 }

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

@@ -22,7 +22,7 @@
 @NodeChild(value = "value")
 public abstract class WriteGlobalVariableNode extends RubyNode {
 
-    private final String name;
+    protected final String name;
 
     public WriteGlobalVariableNode(String name) {
         this.name = name;
@@ -31,7 +31,7 @@ public WriteGlobalVariableNode(String name) {
     @Specialization(guards = "storage.isSimple()")
     public Object write(VirtualFrame frame, Object value,
             @Cached("getStorage()") GlobalVariableStorage storage,
-            @Cached("create(storage)") WriteSimpleGlobalVariableNode simpleNode) {
+            @Cached("create(name)") WriteSimpleGlobalVariableNode simpleNode) {
         simpleNode.execute(value);
         return value;
     }

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

@@ -1,5 +1,7 @@
 package org.truffleruby.language.globals;
 
+import com.oracle.truffle.api.object.DynamicObject;
+import org.truffleruby.Layouts;
 import org.truffleruby.core.basicobject.BasicObjectNodes.ReferenceEqualNode;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.objects.shared.WriteBarrierNode;
@@ -9,22 +11,23 @@
 
 public abstract class WriteSimpleGlobalVariableNode extends RubyBaseNode {
 
-    protected final GlobalVariableStorage storage;
+    protected final String name;
     @Child protected ReferenceEqualNode referenceEqualNode = ReferenceEqualNode.create();
     @Child protected WriteBarrierNode writeBarrierNode = WriteBarrierNode.create();
 
-    public static WriteSimpleGlobalVariableNode create(GlobalVariableStorage storage) {
-        return WriteSimpleGlobalVariableNodeGen.create(storage);
+    public static WriteSimpleGlobalVariableNode create(String name) {
+        return WriteSimpleGlobalVariableNodeGen.create(name);
     }
 
-    public WriteSimpleGlobalVariableNode(GlobalVariableStorage storage) {
-        this.storage = storage;
+    public WriteSimpleGlobalVariableNode(String name) {
+        this.name = name;
     }
 
     public abstract Object execute(Object value);
 
     @Specialization(guards = "referenceEqualNode.executeReferenceEqual(value, previousValue)", assumptions = "storage.getUnchangedAssumption()")
     public Object writeTryToKeepConstant(Object value,
+            @Cached("getStorage()") GlobalVariableStorage storage,
             @Cached("storage.getValue()") Object previousValue) {
         // NOTE: we still do the volatile write to get the proper memory barrier,
         // as the global variable could be used as a publication mechanism.
@@ -33,7 +36,8 @@ public Object writeTryToKeepConstant(Object value,
     }
 
     @Specialization(guards = "storage.isAssumeConstant()", assumptions = "storage.getUnchangedAssumption()")
-    public Object writeAssumeConstant(Object value) {
+    public Object writeAssumeConstant(Object value,
+            @Cached("getStorage()") GlobalVariableStorage storage) {
         if (getContext().getSharedObjects().isSharing()) {
             writeBarrierNode.executeWriteBarrier(value);
         }
@@ -43,12 +47,17 @@ public Object writeAssumeConstant(Object value) {
     }
 
     @Specialization(guards = "!storage.isAssumeConstant()", replaces = "writeAssumeConstant")
-    public Object write(Object value) {
+    public Object write(Object value,
+            @Cached("getStorage()") GlobalVariableStorage storage) {
         if (getContext().getSharedObjects().isSharing()) {
             writeBarrierNode.executeWriteBarrier(value);
         }
         storage.setValueInternal(value);
         return value;
     }
 
+    protected GlobalVariableStorage getStorage() {
+        return coreLibrary().getGlobalVariables().getStorage(name);
+    }
+
 }