[Truffle] Add spec for z super with a block.

jruby · May 8, 2015 · d15ad1d · eregon · May 11, 2015 · chrisseaton
1 parent 36fbd3b
commit d15ad1d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/spec/ruby/language/fixtures/super.rb b/spec/ruby/language/fixtures/super.rb
@@ -355,4 +355,19 @@ class AnonymousModuleIncludedTwice < AnonymousModuleIncludedTwiceBase
     whatever
     whatever
   end
+
+  module ZSuperWithBlock
+    class A
+      def a
+        yield
+      end
+    end
+
+    class B < A
+      def a
+        super { 14 }
+      end
+    end
+  end
+
 end
diff --git a/spec/ruby/language/super_spec.rb b/spec/ruby/language/super_spec.rb
@@ -161,4 +161,9 @@ def a(arg)
   it "invokes methods from a chain of anonymous modules" do
     Super::AnonymousModuleIncludedTwice.new.a([]).should == ["anon", "anon", "non-anon"]
   end
+
+  it "can accept a block but still pass the original arguments" do
+    Super::ZSuperWithBlock::B.new.a.should == 14
+  end
+
 end
diff --git a/truffle/src/main/java/org/jruby/truffle/translator/MethodTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/MethodTranslator.java
@@ -272,8 +272,7 @@ public RubyNode visitZSuperNode(org.jruby.ast.ZSuperNode node) {
 
         if (node.getIterNode() != null) {
             currentCallMethodName = environment.getNamedMethodName();
-            node.getIterNode().accept(this);
-            blockNode = null;
+            blockNode = node.getIterNode().accept(this);
         } else {
             blockNode = null;
         }