Don't instantiate SourceIndexLength in translators where it's not needed

andrykonchin · andrykonchin · commit f2bd2d2d408f · 2024-02-12T17:12:15.000+02:00
diff --git a/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_else_branch.yaml b/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_else_branch.yaml
@@ -95,8 +95,8 @@ ast: |
                                           attributes:
                                               flags = 0
                                               frameSlot = 2 # %case_0
-                                              sourceCharIndex = 0
-                                              sourceLength = 89
+                                              sourceCharIndex = -1
+                                              sourceLength = 0
                                               type = FRAME_LOCAL
                       elseBody =
                           IfElseNodeGen
@@ -127,8 +127,8 @@ ast: |
                                                       attributes:
                                                           flags = 0
                                                           frameSlot = 2 # %case_0
-                                                          sourceCharIndex = 0
-                                                          sourceLength = 89
+                                                          sourceCharIndex = -1
+                                                          sourceLength = 0
                                                           type = FRAME_LOCAL
                                   elseBody =
                                       StringLiteralNode
diff --git a/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_multiple_values.yaml b/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_multiple_values.yaml
@@ -95,8 +95,8 @@ ast: |
                                                       attributes:
                                                           flags = 0
                                                           frameSlot = 2 # %case_0
-                                                          sourceCharIndex = 0
-                                                          sourceLength = 39
+                                                          sourceCharIndex = -1
+                                                          sourceLength = 0
                                                           type = FRAME_LOCAL
                                   right =
                                       InlinedCaseEqualNodeGen
@@ -120,8 +120,8 @@ ast: |
                                                       attributes:
                                                           flags = 0
                                                           frameSlot = 2 # %case_0
-                                                          sourceCharIndex = 0
-                                                          sourceLength = 39
+                                                          sourceCharIndex = -1
+                                                          sourceLength = 0
                                                           type = FRAME_LOCAL
                       elseBody =
                           NilLiteralNode
diff --git a/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_single_value.yaml b/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_single_value.yaml
@@ -94,8 +94,8 @@ ast: |
                                           attributes:
                                               flags = 0
                                               frameSlot = 2 # %case_0
-                                              sourceCharIndex = 0
-                                              sourceLength = 74
+                                              sourceCharIndex = -1
+                                              sourceLength = 0
                                               type = FRAME_LOCAL
                       elseBody =
                           IfElseNodeGen
@@ -126,8 +126,8 @@ ast: |
                                                       attributes:
                                                           flags = 0
                                                           frameSlot = 2 # %case_0
-                                                          sourceCharIndex = 0
-                                                          sourceLength = 74
+                                                          sourceCharIndex = -1
+                                                          sourceLength = 0
                                                           type = FRAME_LOCAL
                                   elseBody =
                                       NilLiteralNode
diff --git a/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator.yaml b/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator.yaml
@@ -71,8 +71,8 @@ ast: |
                               attributes:
                                   flags = 0
                                   frameSlot = 2 # %case_0
-                                  sourceCharIndex = 0
-                                  sourceLength = 28
+                                  sourceCharIndex = -1
+                                  sourceLength = 0
                                   type = FRAME_LOCAL
                       ]
                       receiver =
diff --git a/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator_and_following_element.yaml b/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator_and_following_element.yaml
@@ -94,8 +94,8 @@ ast: |
                               attributes:
                                   flags = 0
                                   frameSlot = 2 # %case_0
-                                  sourceCharIndex = 0
-                                  sourceLength = 32
+                                  sourceCharIndex = -1
+                                  sourceLength = 0
                                   type = FRAME_LOCAL
                       ]
                       receiver =
diff --git a/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator_and_following_elements.yaml b/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator_and_following_elements.yaml
@@ -100,8 +100,8 @@ ast: |
                               attributes:
                                   flags = 0
                                   frameSlot = 2 # %case_0
-                                  sourceCharIndex = 0
-                                  sourceLength = 40
+                                  sourceCharIndex = -1
+                                  sourceLength = 0
                                   type = FRAME_LOCAL
                       ]
                       receiver =
diff --git a/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator_and_preceding_and_following_element.yaml b/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator_and_preceding_and_following_element.yaml
@@ -109,8 +109,8 @@ ast: |
                               attributes:
                                   flags = 0
                                   frameSlot = 2 # %case_0
-                                  sourceCharIndex = 0
-                                  sourceLength = 40
+                                  sourceCharIndex = -1
+                                  sourceLength = 0
                                   type = FRAME_LOCAL
                       ]
                       receiver =
diff --git a/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator_and_preceding_and_following_elements.yaml b/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator_and_preceding_and_following_elements.yaml
@@ -123,8 +123,8 @@ ast: |
                               attributes:
                                   flags = 0
                                   frameSlot = 2 # %case_0
-                                  sourceCharIndex = 0
-                                  sourceLength = 54
+                                  sourceCharIndex = -1
+                                  sourceLength = 0
                                   type = FRAME_LOCAL
                       ]
                       receiver =
diff --git a/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator_and_preceding_element.yaml b/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator_and_preceding_element.yaml
@@ -94,8 +94,8 @@ ast: |
                               attributes:
                                   flags = 0
                                   frameSlot = 2 # %case_0
-                                  sourceCharIndex = 0
-                                  sourceLength = 32
+                                  sourceCharIndex = -1
+                                  sourceLength = 0
                                   type = FRAME_LOCAL
                       ]
                       receiver =
diff --git a/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator_and_preceding_elements.yaml b/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator_and_preceding_elements.yaml
@@ -100,8 +100,8 @@ ast: |
                               attributes:
                                   flags = 0
                                   frameSlot = 2 # %case_0
-                                  sourceCharIndex = 0
-                                  sourceLength = 40
+                                  sourceCharIndex = -1
+                                  sourceLength = 0
                                   type = FRAME_LOCAL
                       ]
                       receiver =
diff --git a/spec/truffle/parsing/fixtures/method_calls/primitive.yaml b/spec/truffle/parsing/fixtures/method_calls/primitive.yaml
@@ -59,7 +59,7 @@ ast: |
                                                           sourceLength = 0
                           TypeNodesFactory$IsNilNodeFactory$IsNilNodeGen
                               attributes:
-                                  flags = 0
+                                  flags = 1
                                   sourceCharIndex = 32
                                   sourceLength = 18
                               children:
diff --git a/spec/truffle/parsing/fixtures/operators/match/=~_with_regexp_without_interpolation_with_named_capture_groups_as_receiver.yaml b/spec/truffle/parsing/fixtures/operators/match/=~_with_regexp_without_interpolation_with_named_capture_groups_as_receiver.yaml
@@ -109,7 +109,7 @@ ast: |
                                           attributes:
                                               flags = 0
                                               frameSlot = 3 # %match_data_0
-                                              sourceCharIndex = 0
-                                              sourceLength = 24
+                                              sourceCharIndex = -1
+                                              sourceLength = 0
                                               type = FRAME_LOCAL
           ]
diff --git a/src/main/java/org/truffleruby/builtins/PrimitiveNodeConstructor.java b/src/main/java/org/truffleruby/builtins/PrimitiveNodeConstructor.java
@@ -9,17 +9,14 @@
  */
 package org.truffleruby.builtins;
 
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.annotations.Primitive;
 import org.truffleruby.core.array.ArrayUtils;
 import org.truffleruby.core.numeric.FixnumLowerNodeGen.FixnumLowerASTNodeGen;
 import org.truffleruby.core.support.TypeNodes;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.RubyNode;
-import org.truffleruby.language.SourceIndexLength;
 
 import com.oracle.truffle.api.dsl.NodeFactory;
-import com.oracle.truffle.api.source.Source;
 
 public final class PrimitiveNodeConstructor {
 
@@ -39,13 +36,7 @@ public NodeFactory<? extends RubyBaseNode> getFactory() {
         return factory;
     }
 
-    public RubyNode createInvokePrimitiveNode(Source source, SourceIndexLength sourceSection, RubyNode[] arguments) {
-        if (arguments.length != getPrimitiveArity()) {
-            throw new Error(
-                    "Incorrect number of arguments (expected " + getPrimitiveArity() + ") at " +
-                            RubyLanguage.getCurrentContext().fileLine(sourceSection.toSourceSection(source)));
-        }
-
+    public RubyNode createInvokePrimitiveNode(RubyNode[] arguments) {
         for (int n = 0; n < arguments.length; n++) {
             if (ArrayUtils.contains(annotation.lowerFixnum(), n)) {
                 arguments[n] = FixnumLowerASTNodeGen.create(arguments[n]);
@@ -58,9 +49,7 @@ public RubyNode createInvokePrimitiveNode(Source source, SourceIndexLength sourc
             }
         }
 
-        final RubyNode primitiveNode = (RubyNode) CoreMethodNodeManager.createNodeFromFactory(factory, arguments);
-        primitiveNode.unsafeSetSourceSection(sourceSection);
-        return primitiveNode;
+        return (RubyNode) CoreMethodNodeManager.createNodeFromFactory(factory, arguments);
     }
 
 }
diff --git a/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java b/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java
@@ -24,7 +24,6 @@
 import org.truffleruby.language.LexicalScope;
 import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyNode;
-import org.truffleruby.language.SourceIndexLength;
 import org.truffleruby.language.control.BreakID;
 import org.truffleruby.language.control.ReturnID;
 import org.truffleruby.language.literal.NilLiteralNode;
@@ -263,21 +262,8 @@ public int findFrameSlot(Object name) {
         return index;
     }
 
-    public ReadLocalNode findOrAddLocalVarNodeDangerous(String name, SourceIndexLength sourceSection) {
-        ReadLocalNode localVar = findLocalVarNodeOrNull(name, sourceSection);
-
-        if (localVar == null) {
-            declareVar(name);
-            localVar = findLocalVarNode(name, sourceSection);
-        }
-
-        return localVar;
-    }
-
-    public ReadLocalVariableNode readNode(int slot, SourceIndexLength sourceSection) {
-        var node = new ReadLocalVariableNode(LocalVariableType.FRAME_LOCAL, slot);
-        node.unsafeSetSourceSection(sourceSection);
-        return node;
+    public ReadLocalVariableNode readNode(int slot) {
+        return new ReadLocalVariableNode(LocalVariableType.FRAME_LOCAL, slot);
     }
 
     public ReadLocalVariableNode readNode(int slot, Nodes.Node yarpNode) {
@@ -286,17 +272,16 @@ public ReadLocalVariableNode readNode(int slot, Nodes.Node yarpNode) {
         return node;
     }
 
-    public RubyNode findLocalVarOrNilNode(String name, SourceIndexLength sourceSection) {
-        RubyNode node = findLocalVarNodeOrNull(name, sourceSection);
+    public RubyNode findLocalVarOrNilNode(String name) {
+        RubyNode node = findLocalVarNodeOrNull(name);
         if (node == null) {
             node = new NilLiteralNode();
-            node.unsafeSetSourceSection(sourceSection);
         }
         return node;
     }
 
-    public ReadLocalNode findLocalVarNode(String name, SourceIndexLength sourceSection) {
-        final ReadLocalNode node = findLocalVarNodeOrNull(name, sourceSection);
+    public ReadLocalNode findLocalVarNode(String name) {
+        final ReadLocalNode node = findLocalVarNodeOrNull(name);
 
         if (node == null) {
             throw CompilerDirectives.shouldNotReachHere(name + " local variable should be declared");
@@ -305,7 +290,7 @@ public ReadLocalNode findLocalVarNode(String name, SourceIndexLength sourceSecti
         return node;
     }
 
-    public ReadLocalNode findLocalVarNodeOrNull(String name, SourceIndexLength sourceSection) {
+    public ReadLocalNode findLocalVarNodeOrNull(String name) {
         assert name != null;
         TranslatorEnvironment current = this;
         int level = 0;
@@ -321,7 +306,6 @@ public ReadLocalNode findLocalVarNodeOrNull(String name, SourceIndexLength sourc
                     node = new ReadDeclarationVariableNode(LocalVariableType.FRAME_LOCAL, level, slot);
                 }
 
-                node.unsafeSetSourceSection(sourceSection);
                 return node;
             }
 
diff --git a/src/main/java/org/truffleruby/parser/YARPMultiTargetNodeTranslator.java b/src/main/java/org/truffleruby/parser/YARPMultiTargetNodeTranslator.java
@@ -167,7 +167,7 @@ public AssignableNode visitSplatNode(Nodes.SplatNode node) {
     // RequiredParameterNode is handled during destructuring method/proc arguments
     public AssignableNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) {
         final String name = node.name;
-        final ReadLocalNode lhs = yarpTranslator.getEnvironment().findLocalVarNode(name, null);
+        final ReadLocalNode lhs = yarpTranslator.getEnvironment().findLocalVarNode(name);
         final RubyNode rhs = new DeadNode("YARPMultiTargetNodeTranslator#visitRequiredParameterNode");
         final WriteLocalNode rubyNode = lhs.makeWriteNode(rhs);
 
diff --git a/src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java b/src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java
@@ -136,11 +136,11 @@ public RubyNode[] reload(Nodes.ParametersNode parameters) {
         if (parameters.keyword_rest instanceof Nodes.ForwardingParameterNode) {
             // ... parameter (so-called "forward arguments") means there is implicit * parameter
             restParameterIndex = parameters.requireds.length + parameters.optionals.length;
-            var readRestNode = environment.findLocalVarNode(TranslatorEnvironment.FORWARDED_REST_NAME, null);
+            var readRestNode = environment.findLocalVarNode(TranslatorEnvironment.FORWARDED_REST_NAME);
             sequence.add(readRestNode);
 
             // ... parameter (so-called "forward arguments") means there is implicit ** parameter
-            var readKeyRestNode = environment.findLocalVarNode(TranslatorEnvironment.FORWARDED_KEYWORD_REST_NAME, null);
+            var readKeyRestNode = environment.findLocalVarNode(TranslatorEnvironment.FORWARDED_KEYWORD_REST_NAME);
             sequence.add(readKeyRestNode);
         }
 
@@ -157,7 +157,7 @@ public RubyNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) {
             name = node.name;
         }
 
-        return environment.findLocalVarNode(name, null);
+        return environment.findLocalVarNode(name);
     }
 
     @Override
@@ -170,7 +170,7 @@ public RubyNode visitOptionalParameterNode(Nodes.OptionalParameterNode node) {
             name = node.name;
         }
 
-        return environment.findLocalVarNode(name, null);
+        return environment.findLocalVarNode(name);
     }
 
     @Override
@@ -193,23 +193,23 @@ public RubyNode visitRestParameterNode(Nodes.RestParameterNode node) {
             name = TranslatorEnvironment.DEFAULT_REST_NAME;
         }
 
-        return environment.findLocalVarNode(name, null);
+        return environment.findLocalVarNode(name);
     }
 
     @Override
     public RubyNode visitRequiredKeywordParameterNode(Nodes.RequiredKeywordParameterNode node) {
-        return environment.findLocalVarNode(node.name, null);
+        return environment.findLocalVarNode(node.name);
     }
 
     @Override
     public RubyNode visitOptionalKeywordParameterNode(Nodes.OptionalKeywordParameterNode node) {
-        return environment.findLocalVarNode(node.name, null);
+        return environment.findLocalVarNode(node.name);
     }
 
     @Override
     public RubyNode visitKeywordRestParameterNode(Nodes.KeywordRestParameterNode node) {
         final String name = node.name != null ? node.name : TranslatorEnvironment.DEFAULT_KEYWORD_REST_NAME;
-        return environment.findLocalVarNode(name, null);
+        return environment.findLocalVarNode(name);
     }
 
     @Override
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
