[GR-17457] Inline logic to read self in ReadInstanceVariableNode and WriteInstanceVariableNode

PullRequest: truffleruby/3822

Author: eregon

src/main/java/org/truffleruby/language/objects/ReadInstanceVariableNode.java

@@ -20,28 +20,29 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.profiles.ConditionProfile;
+import org.truffleruby.language.locals.ReadFrameSlotNode;
 
 public class ReadInstanceVariableNode extends RubyContextSourceNode {
 
     private final String name;
 
-    @Child private RubyNode receiver;
+    @Child private ReadFrameSlotNode readSelfSlotNode;
     @Child private DynamicObjectLibrary objectLibrary;
 
     private final ConditionProfile objectProfile = ConditionProfile.create();
 
-    public ReadInstanceVariableNode(String name, RubyNode receiver) {
+    public ReadInstanceVariableNode(String name) {
         this.name = name;
-        this.receiver = receiver;
+        this.readSelfSlotNode = SelfNode.createReadSelfFrameSlotNode();
     }
 
     @Override
     public Object execute(VirtualFrame frame) {
-        final Object receiverObject = receiver.execute(frame);
+        final Object self = SelfNode.readSelf(frame, readSelfSlotNode);
 
-        if (objectProfile.profile(receiverObject instanceof RubyDynamicObject)) {
+        if (objectProfile.profile(self instanceof RubyDynamicObject)) {
             final DynamicObjectLibrary objectLibrary = getObjectLibrary();
-            final RubyDynamicObject dynamicObject = (RubyDynamicObject) receiverObject;
+            final RubyDynamicObject dynamicObject = (RubyDynamicObject) self;
             return objectLibrary.getOrDefault(dynamicObject, name, nil);
         } else {
             return nil;
@@ -50,11 +51,11 @@ public Object execute(VirtualFrame frame) {
 
     @Override
     public Object isDefined(VirtualFrame frame, RubyLanguage language, RubyContext context) {
-        final Object receiverObject = receiver.execute(frame);
+        final Object self = SelfNode.readSelf(frame, readSelfSlotNode);
 
-        if (objectProfile.profile(receiverObject instanceof RubyDynamicObject)) {
+        if (objectProfile.profile(self instanceof RubyDynamicObject)) {
             final DynamicObjectLibrary objectLibrary = getObjectLibrary();
-            final RubyDynamicObject dynamicObject = (RubyDynamicObject) receiverObject;
+            final RubyDynamicObject dynamicObject = (RubyDynamicObject) self;
             if (objectLibrary.containsKey(dynamicObject, name)) {
                 return FrozenStrings.INSTANCE_VARIABLE;
             } else {
@@ -78,9 +79,7 @@ private DynamicObjectLibrary getObjectLibrary() {
 
     @Override
     public RubyNode cloneUninitialized() {
-        var copy = new ReadInstanceVariableNode(
-                name,
-                receiver.cloneUninitialized());
+        var copy = new ReadInstanceVariableNode(name);
         return copy.copyFlags(this);
     }
 

src/main/java/org/truffleruby/language/objects/SelfNode.java

@@ -31,16 +31,23 @@ public class SelfNode extends RubyContextSourceNode {
     public SelfNode() {
     }
 
-    @Override
-    public Object execute(VirtualFrame frame) {
+    public static ReadFrameSlotNode createReadSelfFrameSlotNode() {
+        return ReadFrameSlotNodeGen.create(SELF_INDEX);
+    }
+
+    public static Object readSelf(VirtualFrame frame, ReadFrameSlotNode readSelfSlotNode) {
         assert frame.getFrameDescriptor().getSlotName(SELF_INDEX) == SELF_IDENTIFIER;
+        return readSelfSlotNode.executeRead(frame);
+    }
 
+    @Override
+    public Object execute(VirtualFrame frame) {
         if (readSelfSlotNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            readSelfSlotNode = insert(ReadFrameSlotNodeGen.create(SELF_INDEX));
+            readSelfSlotNode = insert(createReadSelfFrameSlotNode());
         }
 
-        return readSelfSlotNode.executeRead(frame);
+        return readSelf(frame, readSelfSlotNode);
     }
 
     @Override

src/main/java/org/truffleruby/language/objects/WriteInstanceVariableNode.java

@@ -21,36 +21,37 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import org.truffleruby.language.locals.ReadFrameSlotNode;
 
 public class WriteInstanceVariableNode extends RubyContextSourceNode implements AssignableNode {
 
     private final String name;
 
-    @Child private RubyNode receiver;
+    @Child private ReadFrameSlotNode readSelfSlotNode;
     @Child private IsFrozenNode isFrozenNode;
     @Child private RubyNode rhs;
     @Child private WriteObjectFieldNode writeNode;
 
     @CompilationFinal private boolean frozenProfile;
 
-    public WriteInstanceVariableNode(String name, RubyNode receiver, RubyNode rhs) {
+    public WriteInstanceVariableNode(String name, RubyNode rhs) {
         this.name = name;
-        this.receiver = receiver;
+        this.readSelfSlotNode = SelfNode.createReadSelfFrameSlotNode();
         this.rhs = rhs;
     }
 
     @Override
     public Object execute(VirtualFrame frame) {
-        final Object object = receiver.execute(frame);
+        final Object self = SelfNode.readSelf(frame, readSelfSlotNode);
         final Object value = rhs.execute(frame);
-        write(object, value);
+        write(self, value);
         return value;
     }
 
     @Override
     public void assign(VirtualFrame frame, Object value) {
-        final Object object = receiver.execute(frame);
-        write(object, value);
+        final Object self = SelfNode.readSelf(frame, readSelfSlotNode);
+        write(self, value);
     }
 
     private void write(Object object, Object value) {
@@ -96,10 +97,7 @@ public AssignableNode cloneUninitializedAssignable() {
 
     @Override
     public RubyNode cloneUninitialized() {
-        var copy = new WriteInstanceVariableNode(
-                name,
-                receiver.cloneUninitialized(),
-                cloneUninitialized(rhs));
+        var copy = new WriteInstanceVariableNode(name, cloneUninitialized(rhs));
         return copy.copyFlags(this);
     }
 

src/main/java/org/truffleruby/parser/BodyTranslator.java

@@ -1837,8 +1837,7 @@ public RubyNode visitInstAsgnNode(InstAsgnParseNode node) {
             rhs = node.getValueNode().accept(this);
         }
 
-        final RubyNode self = new SelfNode();
-        final RubyNode ret = new WriteInstanceVariableNode(name, self, rhs);
+        final RubyNode ret = new WriteInstanceVariableNode(name, rhs);
         ret.unsafeSetSourceSection(sourceSection);
         return addNewlineIfNeeded(node, ret);
     }
@@ -1847,11 +1846,7 @@ public RubyNode visitInstAsgnNode(InstAsgnParseNode node) {
     public RubyNode visitInstVarNode(InstVarParseNode node) {
         final SourceIndexLength sourceSection = node.getPosition();
         final String name = node.getName();
-
-        // About every case will use a SelfParseNode, just don't it use more than once.
-        final SelfNode self = new SelfNode();
-
-        final RubyNode ret = new ReadInstanceVariableNode(name, self);
+        final RubyNode ret = new ReadInstanceVariableNode(name);
         ret.unsafeSetSourceSection(sourceSection);
         return addNewlineIfNeeded(node, ret);
     }