[Truffle] Fix passing a block in a z super call.

jruby · May 8, 2015 · 36fbd3b · 36fbd3b · nirvdrum · May 8, 2015
1 parent 42fcefa
commit 36fbd3b
Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperReCallNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperReCallNode.java
@@ -12,18 +12,23 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
+import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.RubyArguments;
 import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.truffle.runtime.core.RubyNilClass;
+import org.jruby.truffle.runtime.core.RubyProc;
 
 import java.util.Arrays;
 
 public class GeneralSuperReCallNode extends AbstractGeneralSuperCallNode {
 
     private final boolean inBlock;
+    @Child private RubyNode block;
 
-    public GeneralSuperReCallNode(RubyContext context, SourceSection sourceSection, boolean inBlock) {
+    public GeneralSuperReCallNode(RubyContext context, SourceSection sourceSection, boolean inBlock, RubyNode block) {
         super(context, sourceSection);
         this.inBlock = inBlock;
+        this.block = block;
     }
 
     @Override
@@ -45,6 +50,16 @@ public final Object execute(VirtualFrame frame) {
 
         final Object[] superArguments = Arrays.copyOf(originalArguments, originalArguments.length);
 
+        if (block != null) {
+            Object blockObject = block.execute(frame);
+
+            if (blockObject == nil()) {
+                blockObject = null;
+            }
+
+            superArguments[RubyArguments.BLOCK_INDEX] = blockObject;
+        }
+
         superArguments[RubyArguments.METHOD_INDEX] = superMethod;
 
         return callNode.call(frame, superArguments);

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
@@ -91,7 +91,7 @@ public class BodyTranslator extends Translator {
     public boolean useClassVariablesAsIfInClass = false;
     private boolean translatingNextExpression = false;
     private boolean translatingWhile = false;
-    private String currentCallMethodName = null;
+    protected String currentCallMethodName = null;
 
     private boolean privately = false;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/MethodTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/MethodTranslator.java
@@ -268,7 +268,17 @@ public RubyNode visitZSuperNode(org.jruby.ast.ZSuperNode node) {
             environment.setNeedsDeclarationFrame();
         }
 
-        return new GeneralSuperReCallNode(context, sourceSection, environment.isBlock());
+        final RubyNode blockNode;
+
+        if (node.getIterNode() != null) {
+            currentCallMethodName = environment.getNamedMethodName();
+            node.getIterNode().accept(this);
+            blockNode = null;
+        } else {
+            blockNode = null;
+        }
+
+        return new GeneralSuperReCallNode(context, sourceSection, environment.isBlock(), blockNode);
     }
 
     @Override