[GR-25942] Fix PE recursion in Proc.new

PullRequest: truffleruby/1981

Author: eregon

src/main/java/org/truffleruby/core/kernel/KernelNodes.java

@@ -9,6 +9,11 @@
  */
 package org.truffleruby.core.kernel;
 
+import static org.truffleruby.language.dispatch.DispatchConfiguration.PRIVATE;
+import static org.truffleruby.language.dispatch.DispatchConfiguration.PRIVATE_DOES_RESPOND;
+import static org.truffleruby.language.dispatch.DispatchConfiguration.PUBLIC;
+import static org.truffleruby.language.dispatch.DispatchConfiguration.PUBLIC_DOES_RESPOND;
+
 import java.io.File;
 import java.io.PrintStream;
 import java.nio.file.Paths;
@@ -17,7 +22,6 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import com.oracle.truffle.api.nodes.NodeUtil;
 import org.jcodings.specific.UTF8Encoding;
 import org.truffleruby.RubyContext;
 import org.truffleruby.builtins.CoreMethod;
@@ -59,7 +63,6 @@
 import org.truffleruby.core.numeric.BigIntegerOps;
 import org.truffleruby.core.numeric.RubyBignum;
 import org.truffleruby.core.proc.ProcNodes.ProcNewNode;
-import org.truffleruby.core.proc.ProcNodesFactory.ProcNewNodeFactory;
 import org.truffleruby.core.proc.ProcOperations;
 import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.core.rope.CodeRange;
@@ -148,18 +151,14 @@
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.Property;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
 
-import static org.truffleruby.language.dispatch.DispatchConfiguration.PRIVATE;
-import static org.truffleruby.language.dispatch.DispatchConfiguration.PRIVATE_DOES_RESPOND;
-import static org.truffleruby.language.dispatch.DispatchConfiguration.PUBLIC;
-import static org.truffleruby.language.dispatch.DispatchConfiguration.PUBLIC_DOES_RESPOND;
-
 @CoreModule("Kernel")
 public abstract class KernelNodes {
 
@@ -1424,10 +1423,9 @@ protected RubyArray privateMethods(Object self, boolean includeAncestors) {
     @CoreMethod(names = "proc", isModuleFunction = true, needsBlock = true)
     public abstract static class ProcNode extends CoreMethodArrayArgumentsNode {
 
-        @Child private ProcNewNode procNewNode = ProcNewNodeFactory.create(null);
-
         @Specialization
-        protected RubyProc proc(VirtualFrame frame, Object maybeBlock) {
+        protected RubyProc proc(VirtualFrame frame, Object maybeBlock,
+                @Cached ProcNewNode procNewNode) {
             return procNewNode.executeProcNew(frame, coreLibrary().procClass, ArrayUtils.EMPTY_ARRAY, maybeBlock);
         }
 

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

@@ -63,42 +63,27 @@ protected RubyProc allocate(RubyClass rubyClass) {
     @CoreMethod(names = "new", constructor = true, needsBlock = true, rest = true)
     public abstract static class ProcNewNode extends CoreMethodArrayArgumentsNode {
 
-        @Child private DispatchNode initializeNode;
-        @Child private AllocateHelperNode allocateHelper;
+        public static ProcNewNode create() {
+            return ProcNodesFactory.ProcNewNodeFactory.create(null);
+        }
 
-        public abstract RubyProc executeProcNew(
-                VirtualFrame frame,
-                RubyClass procClass,
-                Object[] args,
-                Object block);
+        public abstract RubyProc executeProcNew(VirtualFrame frame, RubyClass procClass, Object[] args, Object block);
 
         @Specialization
         protected RubyProc proc(VirtualFrame frame, RubyClass procClass, Object[] args, NotProvided block,
                 @Cached("create(nil)") FindAndReadDeclarationVariableNode readNode,
-                @Cached ReadCallerFrameNode readCaller) {
+                @Cached ReadCallerFrameNode readCaller,
+                @Cached ProcNewNode recurseNode) {
             final MaterializedFrame parentFrame = readCaller.execute(frame);
 
-            Object parentBlock = readNode
-                    .execute(parentFrame, TranslatorEnvironment.METHOD_BLOCK_NAME);
-
-            if (parentBlock == nil) {
-                parentBlock = tryParentBlockForCExts();
-            }
+            Object parentBlock = readNode.execute(parentFrame, TranslatorEnvironment.METHOD_BLOCK_NAME);
 
             if (parentBlock == nil) {
                 throw new RaiseException(getContext(), coreExceptions().argumentErrorProcWithoutBlock(this));
+            } else {
+                final RubyProc proc = (RubyProc) parentBlock;
+                return recurseNode.executeProcNew(frame, procClass, args, proc);
             }
-
-            return executeProcNew(frame, procClass, args, parentBlock);
-        }
-
-        @TruffleBoundary
-        protected Object tryParentBlockForCExts() {
-            /* TODO CS 11-Mar-17 to pass the remaining cext proc specs we need to determine here if Proc.new has been
-             * called from a cext from rb_funcall, and then reach down the stack to the Ruby method that originally went
-             * into C and get the block from there. */
-
-            return nil;
         }
 
         @Specialization(guards = { "procClass == getProcClass()", "block.getShape() == getProcShape()" })