[GR-16067] Super call block arg fix.

PullRequest: truffleruby/863

Author: aardvark179

spec/ruby/language/super_spec.rb

@@ -102,6 +102,25 @@ def m(v)
     c2.new.m(:dump) { :value }.should == :value
   end
 
+  it "uses block argument given to method when used in a block" do
+    c1 = Class.new do
+      def m
+        yield
+      end
+    end
+    c2 = Class.new(c1) do
+      def m(v)
+        ary = []
+        1.times do
+          ary << super()
+        end
+        ary
+      end
+    end
+
+    c2.new.m(:dump) { :value }.should == [ :value ]
+  end
+
   it "calls the superclass method when in a block" do
     SuperSpecs::S6.new.here.should == :good
   end

src/main/java/org/truffleruby/builtins/CoreMethodNodeManager.java

@@ -34,7 +34,7 @@
 import org.truffleruby.language.arguments.MissingArgumentBehavior;
 import org.truffleruby.language.arguments.NotProvidedNode;
 import org.truffleruby.language.arguments.ProfileArgumentNodeGen;
-import org.truffleruby.language.arguments.ReadBlockNode;
+import org.truffleruby.language.arguments.ReadBlockFromCurrentFrameArgumentsNode;
 import org.truffleruby.language.arguments.ReadKeywordArgumentNode;
 import org.truffleruby.language.arguments.ReadPreArgumentNode;
 import org.truffleruby.language.arguments.ReadRemainingArgumentsNode;
@@ -254,7 +254,7 @@ public static RubyNode createCoreMethodNode(NodeFactory<? extends RubyNode> node
         }
 
         if (method.needsBlock()) {
-            argumentsNodes[i++] = new ReadBlockNode(NotProvided.INSTANCE);
+            argumentsNodes[i++] = new ReadBlockFromCurrentFrameArgumentsNode(NotProvided.INSTANCE);
         }
 
         if (!method.keywordAsOptional().isEmpty()) {

src/main/java/org/truffleruby/core/proc/ProcNodes.java

@@ -24,8 +24,6 @@
 import org.truffleruby.language.NotProvided;
 import org.truffleruby.language.Visibility;
 import org.truffleruby.language.arguments.ArgumentDescriptorUtils;
-import org.truffleruby.language.arguments.ReadBlockNode;
-import org.truffleruby.language.arguments.RubyArguments;
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.CallDispatchHeadNode;
 import org.truffleruby.language.locals.FindDeclarationVariableNodes.FindAndReadDeclarationVariableNode;
@@ -38,7 +36,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -95,10 +92,6 @@ protected static void debug(String str) {
             System.err.println(str);
         }
 
-        protected static ReadBlockNode createReadBlock() {
-            return new ReadBlockNode(null);
-        }
-
         @TruffleBoundary
         protected DynamicObject tryParentBlockForCExts() {
             /*

src/main/java/org/truffleruby/language/arguments/ReadBlockNode.java renamed to src/main/java/org/truffleruby/language/arguments/ReadBlockFromCurrentFrameArgumentsNode.java

@@ -16,13 +16,13 @@
 import org.truffleruby.Layouts;
 import org.truffleruby.language.RubyNode;
 
-public class ReadBlockNode extends RubyNode {
+public class ReadBlockFromCurrentFrameArgumentsNode extends RubyNode {
 
     private final Object valueIfAbsent;
 
     private final ConditionProfile nullProfile = ConditionProfile.createBinaryProfile();
 
-    public ReadBlockNode(Object valueIfAbsent) {
+    public ReadBlockFromCurrentFrameArgumentsNode(Object valueIfAbsent) {
         this.valueIfAbsent = valueIfAbsent;
     }
 

src/main/java/org/truffleruby/parser/LoadArgumentsTranslator.java

@@ -25,7 +25,7 @@
 import org.truffleruby.language.arguments.MissingArgumentBehavior;
 import org.truffleruby.language.arguments.MissingKeywordArgumentNode;
 import org.truffleruby.language.arguments.ProfileArgumentNodeGen;
-import org.truffleruby.language.arguments.ReadBlockNode;
+import org.truffleruby.language.arguments.ReadBlockFromCurrentFrameArgumentsNode;
 import org.truffleruby.language.arguments.ReadKeywordArgumentNode;
 import org.truffleruby.language.arguments.ReadKeywordRestArgumentNode;
 import org.truffleruby.language.arguments.ReadOptionalArgumentNode;
@@ -343,14 +343,14 @@ public RubyNode visitRestArgNode(RestArgParseNode node) {
     }
 
     public RubyNode saveMethodBlockArg() {
-        final RubyNode readNode = new ReadBlockNode(context.getCoreLibrary().getNil());
+        final RubyNode readNode = new ReadBlockFromCurrentFrameArgumentsNode(context.getCoreLibrary().getNil());
         final FrameSlot slot = methodBodyTranslator.getEnvironment().getFrameDescriptor().findOrAddFrameSlot(TranslatorEnvironment.METHOD_BLOCK_NAME);
         return new WriteLocalVariableNode(slot, readNode);
     }
 
     @Override
     public RubyNode visitBlockArgNode(BlockArgParseNode node) {
-        final RubyNode readNode = new ReadBlockNode(context.getCoreLibrary().getNil());
+        final RubyNode readNode = new ReadBlockFromCurrentFrameArgumentsNode(context.getCoreLibrary().getNil());
         final FrameSlot slot = methodBodyTranslator.getEnvironment().getFrameDescriptor().findFrameSlot(node.getName());
         return new WriteLocalVariableNode(slot, readNode);
     }

src/main/java/org/truffleruby/parser/MethodTranslator.java

@@ -27,7 +27,6 @@
 import org.truffleruby.language.SourceIndexLength;
 import org.truffleruby.language.arguments.MissingArgumentBehavior;
 import org.truffleruby.language.arguments.ProfileArgumentNodeGen;
-import org.truffleruby.language.arguments.ReadBlockNode;
 import org.truffleruby.language.arguments.ReadPreArgumentNode;
 import org.truffleruby.language.arguments.ShouldDestructureNode;
 import org.truffleruby.language.control.AndNode;
@@ -319,7 +318,7 @@ public RubyNode visitSuperNode(SuperParseNode node) {
         final ArgumentsAndBlockTranslation argumentsAndBlock = translateArgumentsAndBlock(sourceSection, node.getIterNode(), node.getArgsNode(), environment.getNamedMethodName());
 
         final RubyNode arguments = new ReadSuperArgumentsNode(argumentsAndBlock.getArguments(), argumentsAndBlock.isSplatted());
-        final RubyNode block = executeOrInheritBlock(argumentsAndBlock.getBlock());
+        final RubyNode block = executeOrInheritBlock(argumentsAndBlock.getBlock(), node);
 
         RubyNode callNode = new SuperCallNode(arguments, block);
         callNode = wrapCallWithLiteralBlock(argumentsAndBlock, callNode);
@@ -354,19 +353,19 @@ public RubyNode visitZSuperNode(ZSuperParseNode node) {
         final RubyNode arguments = new ReadZSuperArgumentsNode(
                 reloadTranslator.getRestParameterIndex(),
                 reloadSequence.getSequence());
-        final RubyNode block = executeOrInheritBlock(argumentsAndBlock.getBlock());
+        final RubyNode block = executeOrInheritBlock(argumentsAndBlock.getBlock(), node);
 
         RubyNode callNode = new SuperCallNode(arguments, block);
         callNode = wrapCallWithLiteralBlock(argumentsAndBlock, callNode);
 
         return withSourceSection(sourceSection, callNode);
     }
 
-    private RubyNode executeOrInheritBlock(RubyNode blockNode) {
+    private RubyNode executeOrInheritBlock(RubyNode blockNode, ParseNode callNode) {
         if (blockNode != null) {
             return blockNode;
         } else {
-            return new ReadBlockNode(context.getCoreLibrary().getNil());
+            return environment.findLocalVarOrNilNode(TranslatorEnvironment.METHOD_BLOCK_NAME, callNode.getPosition());
         }
     }