jruby · Sep 15, 2015 · Sep 15, 2015
Showing with 16 additions and 1 deletion.

+15 −0 spec/ruby/language/super_spec.rb

+1 −1 truffle/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperCallNode.java
diff --git a/spec/ruby/language/super_spec.rb b/spec/ruby/language/super_spec.rb
@@ -79,6 +79,21 @@ def foo
     lambda {sub_zsuper.new.foo}.should raise_error(NoMethodError, /super/)
   end
 
+  it "uses given block even if arguments are passed explicitly" do
+    c1 = Class.new do
+      def m
+        yield
+      end
+    end
+    c2 = Class.new(c1) do
+      def m(v)
+        super()
+      end
+    end
+
+    c2.new.m(:dump) { :value }.should == :value
+  end
+
   it "calls the superclass method when in a block" do
     Super::S6.new.here.should == :good
   end

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperCallNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperCallNode.java
@@ -75,7 +75,7 @@ public final Object execute(VirtualFrame frame) {
         if (block != null) {
             blockObject = procOrNullNode.executeProcOrNull(block.execute(frame));
         } else {
-            blockObject = null;
+            blockObject = RubyArguments.getBlock(frame.getArguments());
         }
 
         final Object[] argumentsArray;