[Truffle] Fix check for truly UnnamedRestArgNode.

* See #3214.
jruby · Aug 7, 2015 · aa0e79e · aa0e79e
1 parent c925dbf
commit aa0e79e
Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/spec/truffle/tags/language/lambda_tags.txt b/spec/truffle/tags/language/lambda_tags.txt
@@ -13,8 +13,6 @@ fails:"A lambda expression 'lambda { ... }' assigns variables from parameters fo
 fails:"A lambda expression 'lambda { ... }' assigns variables from parameters for definition \n    @a = lambda do |(a, b, *c, d), (*e, f, g), (*h)|\n      [a, b, c, d, e, f, g, h]\n    end"
 fails:"A lambda expression 'lambda { ... }' assigns variables from parameters for definition \n    @a = lambda do |a, (b, (c, *d, (e, (*f)), g), (h, (i, j)))|\n      [a, b, c, d, e, f, g, h, i, j]\n    end"
 fails:"A lambda expression 'lambda { ... }' assigns variables from parameters for definition \n    @a = lambda { |*, **k| k }"
-fails:"A lambda expression 'lambda { ... }' assigns variables from parameters for definition \n    @a = lambda { |*, &b| b }"
 fails:"A lambda expression 'lambda { ... }' assigns variables from parameters for definition \n    @a = lambda do |a: (@a = -> (a: 1) { a }), b:|\n      [a, b]\n    end"
 fails:"A lambda expression 'lambda { ... }' assigns variables from parameters for definition \n    @a = lambda do |a, b=1, *c, (*d, (e)), f: 2, g:, h:, **k, &l|\n      [a, b, c, d, e, f, g, h, k, l]\n    end"
 fails:"A lambda expression 'lambda { ... }' assigns variables from parameters for definition \n    @a = lambda do |a, b=1, *c, d, e:, f: 2, g:, **k, &l|\n      [a, b, c, d, e, f, g, k, l]\n    end"
-fails:"A lambda expression 'lambda { ... }' assigns variables from parameters for definition \n    @a = lambda { |a, | a }"
diff --git a/spec/truffle/tags/language/proc_tags.txt b/spec/truffle/tags/language/proc_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/translator/MethodTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/MethodTranslator.java
@@ -22,6 +22,7 @@
 import org.jruby.ast.KeywordArgNode;
 import org.jruby.ast.LocalAsgnNode;
 import org.jruby.ast.DAsgnNode;
+import org.jruby.ast.UnnamedRestArgNode;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.RubyRootNode;
 import org.jruby.truffle.nodes.arguments.CheckArityNode;
@@ -83,7 +84,7 @@ public RubyNode compileFunctionNode(SourceSection sourceSection, String methodNa
          * follow the specs for now until we see a reason to do something else.
          */
 
-        if (isBlock && argsNode.childNodes().size() == 2 && argsNode.getRestArgNode() instanceof org.jruby.ast.UnnamedRestArgNode) {
+        if (isBlock && argsNode.getRestArgNode() instanceof org.jruby.ast.UnnamedRestArgNode && !((UnnamedRestArgNode) argsNode.getRestArgNode()).isStar()) {
             arityForCheck = new Arity(arity.getPreRequired(), 0, false);
         } else {
             arityForCheck = arity;