Change TranslatorEnvironment#findLocalVarNode to raise exception if variable is not found

Author: andrykonchin

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

@@ -264,7 +264,7 @@ public int findFrameSlot(Object name) {
     }
 
     public ReadLocalNode findOrAddLocalVarNodeDangerous(String name, SourceIndexLength sourceSection) {
-        ReadLocalNode localVar = findLocalVarNode(name, sourceSection);
+        ReadLocalNode localVar = findLocalVarNodeOrNull(name, sourceSection);
 
         if (localVar == null) {
             declareVar(name);
@@ -287,7 +287,7 @@ public ReadLocalVariableNode readNode(int slot, Nodes.Node yarpNode) {
     }
 
     public RubyNode findLocalVarOrNilNode(String name, SourceIndexLength sourceSection) {
-        RubyNode node = findLocalVarNode(name, sourceSection);
+        RubyNode node = findLocalVarNodeOrNull(name, sourceSection);
         if (node == null) {
             node = new NilLiteralNode();
             node.unsafeSetSourceSection(sourceSection);
@@ -296,6 +296,16 @@ public RubyNode findLocalVarOrNilNode(String name, SourceIndexLength sourceSecti
     }
 
     public ReadLocalNode findLocalVarNode(String name, SourceIndexLength sourceSection) {
+        final ReadLocalNode node = findLocalVarNodeOrNull(name, sourceSection);
+
+        if (node == null) {
+            throw CompilerDirectives.shouldNotReachHere(name + " local variable should be declared");
+        }
+
+        return node;
+    }
+
+    public ReadLocalNode findLocalVarNodeOrNull(String name, SourceIndexLength sourceSection) {
         assert name != null;
         TranslatorEnvironment current = this;
         int level = 0;

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

@@ -168,9 +168,6 @@ public AssignableNode visitSplatNode(Nodes.SplatNode node) {
     public AssignableNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) {
         final String name = node.name;
         final ReadLocalNode lhs = yarpTranslator.getEnvironment().findLocalVarNode(name, null);
-
-        assert lhs != null;
-
         final RubyNode rhs = new DeadNode("YARPMultiTargetNodeTranslator#visitRequiredParameterNode");
         final WriteLocalNode rubyNode = lhs.makeWriteNode(rhs);
 

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

@@ -544,7 +544,6 @@ public RubyNode visitBlockArgumentNode(Nodes.BlockArgumentNode node) {
         if (node.expression == null) {
             // def foo(&) a(&) end
             valueNode = environment.findLocalVarNode(FORWARDED_BLOCK_NAME, null);
-            assert valueNode != null : "block forwarding local variable should be declared";
         } else {
             // a(&:b)
             valueNode = node.expression.accept(this);
@@ -1888,7 +1887,6 @@ public RubyNode visitHashNode(Nodes.HashNode node) {
                     //     bar(**)
                     //   end
                     valueNode = environment.findLocalVarNode(DEFAULT_KEYWORD_REST_NAME, null);
-                    assert valueNode != null : "keyrest forwarding local variable should be declared";
                 }
 
                 hashConcats.add(HashCastNodeGen.HashCastASTNodeGen.create(valueNode));
@@ -2435,7 +2433,6 @@ public RubyNode visitLocalVariableReadNode(Nodes.LocalVariableReadNode node) {
         final String name = node.name;
 
         final RubyNode rubyNode = environment.findLocalVarNode(name, null);
-        assert rubyNode != null : name;
 
         return assignPositionAndFlags(node, rubyNode);
     }
@@ -2492,9 +2489,6 @@ public RubyNode visitLocalVariableOrWriteNode(Nodes.LocalVariableOrWriteNode nod
     public WriteLocalNode visitLocalVariableWriteNode(Nodes.LocalVariableWriteNode node) {
         final String name = node.name;
         final ReadLocalNode lhs = environment.findLocalVarNode(name, null);
-
-        assert lhs != null;
-
         final RubyNode rhs = node.value.accept(this);
         final WriteLocalNode rubyNode = lhs.makeWriteNode(rhs);
 
@@ -2506,9 +2500,6 @@ public WriteLocalNode visitLocalVariableWriteNode(Nodes.LocalVariableWriteNode n
     public WriteLocalNode visitLocalVariableTargetNode(Nodes.LocalVariableTargetNode node) {
         final String name = node.name;
         final ReadLocalNode lhs = environment.findLocalVarNode(name, null);
-
-        assert lhs != null;
-
         final RubyNode rhs = new DeadNode("YARPTranslator#visitLocalVariableTargetNode");
         final WriteLocalNode rubyNode = lhs.makeWriteNode(rhs);
 
@@ -3066,7 +3057,6 @@ public RubyNode visitSplatNode(Nodes.SplatNode node) {
 
             // no need for SplatCastNodeGen for * because it's always an Array and cannot be reassigned
             rubyNode = environment.findLocalVarNode(DEFAULT_REST_NAME, null);
-            assert rubyNode != null : "rest forwarding local variable should be declared";
         }
 
         return assignPositionAndFlags(node, rubyNode);