No need to track the enclosing method's block in RubyProc

Author: eregon

src/main/java/org/truffleruby/core/basicobject/BasicObjectNodes.java

@@ -448,7 +448,7 @@ protected Object instanceExec(VirtualFrame frame, Object receiver, Object[] argu
                     block.declarationContext.getRefinements());
             var descriptor = RubyArguments.getDescriptor(frame);
             return callBlockNode.executeCallBlock(
-                    declarationContext, block, receiver, block.block, descriptor, arguments, null);
+                    declarationContext, block, receiver, nil, descriptor, arguments, null);
         }
 
         @Specialization

src/main/java/org/truffleruby/core/method/MethodNodes.java

@@ -320,7 +320,6 @@ private RubyProc createProc(RootCallTarget callTarget, InternalMethod method, Ob
                     declarationFrame,
                     variables,
                     method,
-                    nil,
                     null,
                     method.getDeclarationContext());
         }

src/main/java/org/truffleruby/core/module/ModuleNodes.java

@@ -810,7 +810,7 @@ public Object classExec(ArgumentsDescriptor descriptor, RubyModule self, Object[
                     new FixedDefaultDefinee(self),
                     block.declarationContext.getRefinements());
 
-            return callBlockNode.executeCallBlock(declarationContext, block, self, block.block, descriptor, args, null);
+            return callBlockNode.executeCallBlock(declarationContext, block, self, nil, descriptor, args, null);
         }
     }
 
@@ -2289,7 +2289,7 @@ protected RubyModule refine(RubyModule namespace, RubyModule moduleToRefine, Rub
                     declarationContext,
                     block,
                     refinement,
-                    block.block,
+                    nil,
                     EmptyArgumentsDescriptor.INSTANCE,
                     EMPTY_ARGUMENTS,
                     null);

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

@@ -125,7 +125,6 @@ protected RubyProc procSpecial(VirtualFrame frame, RubyClass procClass, Object[]
                     block.declarationFrame,
                     block.declarationVariables,
                     block.method,
-                    block.block,
                     block.frameOnStackMarker,
                     block.declarationContext);
 
@@ -164,7 +163,6 @@ protected RubyProc dup(RubyProc proc) {
                     proc.declarationFrame,
                     proc.declarationVariables,
                     proc.method,
-                    proc.block,
                     proc.frameOnStackMarker,
                     proc.declarationContext);
 

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

@@ -25,6 +25,8 @@
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 
+import static org.truffleruby.language.RubyBaseNode.nil;
+
 public abstract class ProcOperations {
 
     private static Object[] packArguments(RubyProc proc, ArgumentsDescriptor descriptor, Object... args) {
@@ -34,7 +36,7 @@ private static Object[] packArguments(RubyProc proc, ArgumentsDescriptor descrip
                 proc.method,
                 proc.frameOnStackMarker,
                 getSelf(proc),
-                proc.block,
+                nil,
                 descriptor,
                 args);
     }
@@ -61,7 +63,6 @@ public static RubyProc createRubyProc(
             MaterializedFrame declarationFrame,
             SpecialVariableStorage variables,
             InternalMethod method,
-            Object block,
             FrameOnStackMarker frameOnStackMarker,
             DeclarationContext declarationContext) {
 
@@ -89,7 +90,6 @@ public static RubyProc createRubyProc(
                 declarationFrame,
                 variables,
                 method,
-                block,
                 frameOnStackMarker,
                 declarationContext);
 
@@ -107,7 +107,6 @@ public static RubyProc convertBlock(RubyContext context, RubyLanguage language,
                         block.declarationFrame,
                         block.declarationVariables,
                         block.method,
-                        block.block,
                         type == ProcType.PROC ? block.frameOnStackMarker : null,
                         block.declarationContext);
     }

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

@@ -12,9 +12,7 @@
 import java.util.Set;
 
 import org.truffleruby.core.klass.RubyClass;
-import org.truffleruby.core.string.StringUtils;
 import org.truffleruby.interop.ForeignToRubyArgumentsNode;
-import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.RubyRootNode;
 import org.truffleruby.language.control.FrameOnStackMarker;
@@ -54,7 +52,6 @@ public class RubyProc extends RubyDynamicObject implements ObjectGraphNode {
     /** Can differ from {@link SharedMethodInfo#getRawArgumentDescriptors()} */
     public final ArgumentDescriptor[] argumentDescriptors;
     public final SpecialVariableStorage declarationVariables;
-    public final Object block;
 
     public RubyProc(
             RubyClass rubyClass,
@@ -67,11 +64,9 @@ public RubyProc(
             MaterializedFrame declarationFrame,
             SpecialVariableStorage declarationVariables,
             InternalMethod method,
-            Object block,
             FrameOnStackMarker frameOnStackMarker,
             DeclarationContext declarationContext) {
         super(rubyClass, shape);
-        assert block instanceof Nil || block instanceof RubyProc : StringUtils.toString(block);
         this.type = type;
         this.arity = arity;
         this.argumentDescriptors = argumentDescriptors;
@@ -80,7 +75,6 @@ public RubyProc(
         this.declarationFrame = declarationFrame;
         this.declarationVariables = declarationVariables;
         this.method = method;
-        this.block = block;
         this.frameOnStackMarker = frameOnStackMarker;
         this.declarationContext = declarationContext;
     }
@@ -98,7 +92,6 @@ public RubyProc withArity(Arity newArity, ArgumentDescriptor[] newArgumentDescri
                 declarationFrame,
                 declarationVariables,
                 method,
-                block,
                 frameOnStackMarker,
                 declarationContext);
     }
@@ -107,7 +100,6 @@ public RubyProc withArity(Arity newArity, ArgumentDescriptor[] newArgumentDescri
     public void getAdjacentObjects(Set<Object> reachable) {
         ObjectGraph.getObjectsInFrame(declarationFrame, reachable);
         ObjectGraph.addProperty(reachable, method);
-        ObjectGraph.addProperty(reachable, block);
     }
 
     public boolean isLambda() {

src/main/java/org/truffleruby/core/symbol/SymbolNodes.java

@@ -214,7 +214,6 @@ public static RubyProc createProc(RubyContext context, RubyLanguage language,
                     declarationFrame,
                     variables,
                     method,
-                    nil,
                     null,
                     declarationContext);
         }

src/main/java/org/truffleruby/extra/TruffleGraalNodes.java

@@ -132,7 +132,6 @@ protected RubyProc copyCapturedLocals(RubyProc proc) {
                     newDeclarationFrame,
                     variables,
                     proc.method,
-                    proc.block,
                     proc.frameOnStackMarker,
                     proc.declarationContext);
 

src/main/java/org/truffleruby/language/methods/BlockDefinitionNode.java

@@ -75,7 +75,6 @@ public RubyProc execute(VirtualFrame frame) {
                 frame.materialize(),
                 readSpecialVariableStorageNode.execute(frame),
                 RubyArguments.getMethod(frame),
-                RubyArguments.getBlock(frame),
                 frameOnStackMarker,
                 executeWithoutVisibility(RubyArguments.getDeclarationContext(frame)));
     }

src/main/java/org/truffleruby/language/methods/InternalMethod.java

@@ -29,6 +29,8 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 
+import static org.truffleruby.language.RubyBaseNode.nil;
+
 /** A Ruby method: either a method in a module, a literal module/class body or some meta-information for eval'd code.
  * Blocks capture the method in which they are defined. */
 public class InternalMethod implements ObjectGraphNode {
@@ -79,7 +81,7 @@ public static InternalMethod fromProc(
                 proc,
                 callTarget,
                 null,
-                proc.block);
+                nil);
     }
 
     public InternalMethod(