[Truffle] Use the StaticScope to find the block-local variables.

* See #4181.
jruby · Sep 26, 2016 · 55d74cb · 55d74cb
1 parent 477bcf3
commit 55d74cb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/spec/truffle/tags/language/block_tags.txt b/spec/truffle/tags/language/block_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/parser/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/parser/BodyTranslator.java
@@ -1990,7 +1990,7 @@ private RubyNode translateBlockLikeNode(IterParseNode node, boolean isLambda) {
         final RubyNode definitionNode;
 
         try {
-            definitionNode = methodCompiler.compileBlockNode(sourceSection, sharedMethodInfo.getName(), node.getBodyNode(), sharedMethodInfo, type);
+            definitionNode = methodCompiler.compileBlockNode(sourceSection, sharedMethodInfo.getName(), node.getBodyNode(), sharedMethodInfo, type, node.getScope().getVariables());
         } finally {
             if (isLambda) {
                 frameOnStackMarkerSlotStack.pop();

diff --git a/truffle/src/main/java/org/jruby/truffle/parser/MethodTranslator.java b/truffle/src/main/java/org/jruby/truffle/parser/MethodTranslator.java
@@ -74,7 +74,7 @@ public MethodTranslator(Node currentNode, RubyContext context, BodyTranslator pa
         this.argsNode = argsNode;
     }
 
-    public BlockDefinitionNode compileBlockNode(RubySourceSection sourceSection, String methodName, ParseNode bodyNode, SharedMethodInfo sharedMethodInfo, ProcType type) {
+    public BlockDefinitionNode compileBlockNode(RubySourceSection sourceSection, String methodName, ParseNode bodyNode, SharedMethodInfo sharedMethodInfo, ProcType type, String[] variables) {
         final SourceSection fullSourceSection = sourceSection.toSourceSection(source);
 
         declareArguments();
@@ -135,9 +135,10 @@ public BlockDefinitionNode compileBlockNode(RubySourceSection sourceSection, Str
 
         parentSourceSection.push(sourceSection);
         try {
-            if (argsNode.getBlockLocalVariables() != null && !argsNode.getBlockLocalVariables().isEmpty()) {
-                for (ParseNode var : argsNode.getBlockLocalVariables().children()) {
-                    environment.declareVar(((INameNode) var).getName());
+            if (!translatingForStatement) {
+                // Make sure to declare block-local variables
+                for (String var : variables) {
+                    environment.declareVar(var);
                 }
             }