Make CallerFrameAccess#execute() return a MaterializedFrame

* All usages of CallerFrameAccess materialize anyway.

Author: eregon

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

@@ -266,7 +266,7 @@ public abstract static class InstanceEvalNode extends CoreMethodArrayArgumentsNo
         public Object instanceEval(VirtualFrame frame, Object receiver, DynamicObject string, DynamicObject fileName, int line, NotProvided block,
                 @Cached("create()") ReadCallerFrameNode callerFrameNode,
                 @Cached("create()") IndirectCallNode callNode) {
-            final MaterializedFrame callerFrame = callerFrameNode.execute(frame).materialize();
+            final MaterializedFrame callerFrame = callerFrameNode.execute(frame);
 
             return instanceEvalHelper(callerFrame, receiver, string, fileName, line, callNode);
         }
@@ -275,7 +275,7 @@ public Object instanceEval(VirtualFrame frame, Object receiver, DynamicObject st
         public Object instanceEval(VirtualFrame frame, Object receiver, DynamicObject string, DynamicObject fileName, NotProvided line, NotProvided block,
                 @Cached("create()") ReadCallerFrameNode callerFrameNode,
                 @Cached("create()") IndirectCallNode callNode) {
-            final MaterializedFrame callerFrame = callerFrameNode.execute(frame).materialize();
+            final MaterializedFrame callerFrame = callerFrameNode.execute(frame);
 
             return instanceEvalHelper(callerFrame, receiver, string, fileName, 1, callNode);
         }
@@ -284,7 +284,7 @@ public Object instanceEval(VirtualFrame frame, Object receiver, DynamicObject st
         public Object instanceEval(VirtualFrame frame, Object receiver, DynamicObject string, NotProvided fileName, NotProvided line, NotProvided block,
                 @Cached("create()") ReadCallerFrameNode callerFrameNode,
                 @Cached("create()") IndirectCallNode callNode) {
-            final MaterializedFrame callerFrame = callerFrameNode.execute(frame).materialize();
+            final MaterializedFrame callerFrame = callerFrameNode.execute(frame);
 
             return instanceEvalHelper(callerFrame, receiver, string, coreStrings().EVAL_FILENAME_STRING.createInstance(), 1, callNode);
         }

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

@@ -15,7 +15,6 @@
 import org.jcodings.specific.UTF8Encoding;
 import org.truffleruby.Layouts;
 import org.truffleruby.RubyContext;
-import org.truffleruby.builtins.CallerFrameAccess;
 import org.truffleruby.builtins.CoreClass;
 import org.truffleruby.builtins.CoreMethod;
 import org.truffleruby.builtins.CoreMethodNode;
@@ -388,11 +387,11 @@ public DynamicObject allocate(DynamicObject rubyClass) {
     @Primitive(name = "caller_binding", needsSelf = false)
     public abstract static class CallerBindingNode extends PrimitiveArrayArgumentsNode {
 
-        @Child ReadCallerFrameNode callerFrameNode = new ReadCallerFrameNode(CallerFrameAccess.MATERIALIZE);
+        @Child ReadCallerFrameNode callerFrameNode = new ReadCallerFrameNode();
 
         @Specialization
         public DynamicObject binding(VirtualFrame frame) {
-            final MaterializedFrame callerFrame = callerFrameNode.execute(frame).materialize();
+            final MaterializedFrame callerFrame = callerFrameNode.execute(frame);
 
             return BindingNodes.createBinding(getContext(), callerFrame);
         }

src/main/java/org/truffleruby/core/binding/BindingNodes.java

@@ -39,7 +39,6 @@
 import org.jcodings.specific.UTF8Encoding;
 import org.truffleruby.Layouts;
 import org.truffleruby.RubyContext;
-import org.truffleruby.builtins.CallerFrameAccess;
 import org.truffleruby.builtins.CoreClass;
 import org.truffleruby.builtins.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
@@ -262,11 +261,11 @@ public Object compare(VirtualFrame frame, Object self, Object other) {
     @CoreMethod(names = "binding", isModuleFunction = true)
     public abstract static class BindingNode extends CoreMethodArrayArgumentsNode {
 
-        @Child ReadCallerFrameNode callerFrameNode = new ReadCallerFrameNode(CallerFrameAccess.MATERIALIZE);
+        @Child ReadCallerFrameNode callerFrameNode = new ReadCallerFrameNode();
 
         @Specialization
         protected DynamicObject bindingUncached(VirtualFrame frame) {
-            final MaterializedFrame callerFrame = callerFrameNode.execute(frame).materialize();
+            final MaterializedFrame callerFrame = callerFrameNode.execute(frame);
             final SourceSection sourceSection = getCallerSourceSection();
 
             return BindingNodes.createBinding(getContext(), callerFrame, sourceSection);
@@ -283,13 +282,13 @@ protected SourceSection getCallerSourceSection() {
     @CoreMethod(names = "block_given?", isModuleFunction = true)
     public abstract static class BlockGivenNode extends CoreMethodArrayArgumentsNode {
 
-        @Child ReadCallerFrameNode callerFrameNode = new ReadCallerFrameNode(CallerFrameAccess.MATERIALIZE);
+        @Child ReadCallerFrameNode callerFrameNode = new ReadCallerFrameNode();
 
         @Specialization
         public boolean blockGiven(VirtualFrame frame,
                 @Cached("create(nil())") FindAndReadDeclarationVariableNode readNode,
                 @Cached("createBinaryProfile()") ConditionProfile blockProfile) {
-            MaterializedFrame callerFrame = callerFrameNode.execute(frame).materialize();
+            MaterializedFrame callerFrame = callerFrameNode.execute(frame);
             return blockProfile.profile(readNode.execute(callerFrame, TranslatorEnvironment.METHOD_BLOCK_NAME) != nil());
         }
     }

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

@@ -631,7 +631,7 @@ public Object sliceCapture(
                 @Cached("create()") ReadCallerFrameNode readCallerNode) {
             final Object matchStrPair = callNode.call(string, "subpattern", regexp, capture);
 
-            final DynamicObject binding = BindingNodes.createBinding(getContext(), readCallerNode.execute(frame).materialize());
+            final DynamicObject binding = BindingNodes.createBinding(getContext(), readCallerNode.execute(frame));
             if (matchStrPair == nil()) {
                 setLastMatchNode.call(coreLibrary().getTruffleRegexpOperationsModule(), "set_last_match", nil(), binding);
                 return nil();

src/main/java/org/truffleruby/core/string/StringNodes.java

@@ -9,12 +9,11 @@
  */
 package org.truffleruby.language.arguments;
 
-import org.truffleruby.builtins.CallerFrameAccess;
+import com.oracle.truffle.api.frame.FrameInstance;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.dispatch.CachedDispatchNode;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.DirectCallNode;
@@ -25,17 +24,11 @@ public class ReadCallerFrameNode extends RubyBaseNode {
 
     private final ConditionProfile callerFrameProfile = ConditionProfile.createBinaryProfile();
 
-    private final CallerFrameAccess accessMode;
-
     public static ReadCallerFrameNode create() {
-        return new ReadCallerFrameNode(CallerFrameAccess.MATERIALIZE);
-    }
-
-    public ReadCallerFrameNode(CallerFrameAccess callerFrameAccess) {
-        this.accessMode = callerFrameAccess;
+        return new ReadCallerFrameNode();
     }
 
-    public Frame execute(VirtualFrame frame) {
+    public MaterializedFrame execute(VirtualFrame frame) {
         final MaterializedFrame callerFrame = RubyArguments.getCallerFrame(frame);
 
         if (callerFrameProfile.profile(callerFrame != null)) {
@@ -56,9 +49,9 @@ private void replaceDispatchNode() {
     }
 
     @TruffleBoundary
-    private Frame getCallerFrame() {
+    private MaterializedFrame getCallerFrame() {
         replaceDispatchNode();
-        return getContext().getCallStack().getCallerFrameIgnoringSend().getFrame(accessMode.getFrameAccess());
+        return getContext().getCallStack().getCallerFrameIgnoringSend().getFrame(FrameInstance.FrameAccess.MATERIALIZE).materialize();
     }
 
 }

src/main/java/org/truffleruby/language/arguments/ReadCallerFrameNode.java

@@ -10,7 +10,6 @@
 package org.truffleruby.language.dispatch;
 
 import org.truffleruby.RubyContext;
-import org.truffleruby.builtins.CallerFrameAccess;
 import org.truffleruby.core.rope.RopeNodes;
 import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.language.RubyGuards;
@@ -98,7 +97,7 @@ private synchronized void startSendingFrame(SendsFrame frameToSend) {
         assert needsCallerAssumption != AlwaysValidAssumption.INSTANCE;
         this.sendsFrame = frameToSend;
         if (frameToSend == SendsFrame.CALLER_FRAME) {
-            this.readCaller = insert(new ReadCallerFrameNode(CallerFrameAccess.MATERIALIZE));
+            this.readCaller = insert(new ReadCallerFrameNode());
         }
         Node root = getRootNode();
         if (root instanceof RubyRootNode) {
@@ -195,7 +194,7 @@ private MaterializedFrame getFrameIfRequired(VirtualFrame frame) {
             case MY_FRAME:
                 return frame.materialize();
             case CALLER_FRAME:
-                return readCaller.execute(frame).materialize();
+                return readCaller.execute(frame);
             default:
                 return null;
         }