Use OrLazyValueDefinedNode instead of OrNode for fully qualified constants, attribute and reference optional assignment

andrykonchin · andrykonchin · commit 12cd32b475a6 · 2024-01-30T18:21:32.000+02:00
diff --git a/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment.yaml b/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment.yaml
@@ -47,9 +47,10 @@ ast: |
                                                   SelfNode
                                                       attributes:
                                                           flags = 0
-                          OrNodeGen
+                          OrLazyValueDefinedNodeGen
                               attributes:
                                   flags = 0
+                                  rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                               children:
                                   left =
                                       RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment_with_explicit_self_receiver.yaml b/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment_with_explicit_self_receiver.yaml
@@ -15,9 +15,10 @@ ast: |
           flags = 1
       children:
           child =
-              OrNodeGen
+              OrLazyValueDefinedNodeGen
                   attributes:
                       flags = 0
+                      rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                   children:
                       left =
                           RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment_with_safe_navigation_operator.yaml b/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment_with_safe_navigation_operator.yaml
@@ -73,9 +73,10 @@ ast: |
                                                           frameSlot = 2 # %value_0
                                                           type = FRAME_LOCAL
                                   thenBody =
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment.yaml
@@ -78,9 +78,10 @@ ast: |
                                                               SelfNode
                                                                   attributes:
                                                                       flags = 0
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   InlinedIndexGetNodeGen
diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_block_argument.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_block_argument.yaml
@@ -103,9 +103,10 @@ ast: |
                                                               SelfNode
                                                                   attributes:
                                                                       flags = 0
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_explicit_self_receiver.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_explicit_self_receiver.yaml
@@ -49,9 +49,10 @@ ast: |
                                                       attributes:
                                                           flags = 0
                                                           value = 42
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   InlinedIndexGetNodeGen
diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_multiple_indexes.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_multiple_indexes.yaml
@@ -91,9 +91,10 @@ ast: |
                                                               SelfNode
                                                                   attributes:
                                                                       flags = 0
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_nested_splatted_argument.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_nested_splatted_argument.yaml
@@ -96,9 +96,10 @@ ast: |
                                                               SelfNode
                                                                   attributes:
                                                                       flags = 0
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_splatted_argument.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_splatted_argument.yaml
@@ -95,9 +95,10 @@ ast: |
                                                               SelfNode
                                                                   attributes:
                                                                       flags = 0
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/operators/||=/variable_assignments/constant_fully_qualified.yaml b/spec/truffle/parsing/fixtures/operators/||=/variable_assignments/constant_fully_qualified.yaml
@@ -56,9 +56,10 @@ ast: |
                                                                   attributes:
                                                                       lexicalScope =  :: Object
                                                                       name = "FOO"
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   AndNodeGen
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -861,7 +861,7 @@ public RubyNode visitCallOrWriteNode(Nodes.CallOrWriteNode node) {
                 .accept(this);
         final RubyNode writeNode = callNode(node, writeFlags, readReceiver, node.write_name,
                 node.value).accept(this);
-        final RubyNode orNode = OrNodeGen.create(readNode, writeNode);
+        final RubyNode orNode = OrLazyValueDefinedNodeGen.create(readNode, writeNode);
 
         final RubyNode sequence;
         if (node.isSafeNavigation()) {
@@ -1146,7 +1146,6 @@ public RubyNode visitClassVariableOrWriteNode(Nodes.ClassVariableOrWriteNode nod
         var readNode = new Nodes.ClassVariableReadNode(node.name, startOffset, length).accept(this);
         var andNode = AndNodeGen.create(new DefinedNode(readNode), readNode);
 
-        // TODO: should be used for every ||= node (class variable/etc)?
         final RubyNode rubyNode = OrLazyValueDefinedNodeGen.create(andNode, writeNode);
         return assignPositionAndFlags(node, rubyNode);
     }
@@ -1366,7 +1365,7 @@ public RubyNode visitConstantPathOrWriteNode(Nodes.ConstantPathOrWriteNode node)
         var readNode = (ReadConstantNode) target.accept(this);
         var writeNode = (WriteConstantNode) readNode.makeWriteNode(value);
         var andNode = AndNodeGen.create(new DefinedNode(readNode), readNode);
-        final RubyNode orNode = OrNodeGen.create(andNode, writeNode);
+        final RubyNode orNode = OrLazyValueDefinedNodeGen.create(andNode, writeNode);
 
         final RubyNode rubyNode;
 
@@ -2190,7 +2189,7 @@ private RubyNode translateIndexOrAndIndexAndWriteNodes(boolean isAndOperator, No
         if (isAndOperator) {
             operatorNode = AndNodeGen.create(readNode, writeNode);
         } else {
-            operatorNode = OrNodeGen.create(readNode, writeNode);
+            operatorNode = OrLazyValueDefinedNodeGen.create(readNode, writeNode);
         }
 
         final RubyNode writeArgumentsNode = sequence(Arrays.asList(writeArgumentsNodes));
