Merge CheckReceiverArgumentNode in SymbolProcNode

Author: eregon

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

@@ -18,7 +18,6 @@
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
 import org.truffleruby.Layouts;
 import org.truffleruby.builtins.CoreClass;
@@ -28,9 +27,7 @@
 import org.truffleruby.core.proc.ProcOperations;
 import org.truffleruby.core.proc.ProcType;
 import org.truffleruby.core.string.StringNodes;
-import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.RubyRootNode;
-import org.truffleruby.language.SourceIndexLength;
 import org.truffleruby.language.Visibility;
 import org.truffleruby.language.arguments.ReadCallerFrameNode;
 import org.truffleruby.language.arguments.RubyArguments;
@@ -41,9 +38,6 @@
 import org.truffleruby.language.methods.SharedMethodInfo;
 import org.truffleruby.language.methods.SymbolProcNode;
 import org.truffleruby.parser.ArgumentDescriptor;
-import org.truffleruby.parser.Translator;
-
-import java.util.Arrays;
 
 @CoreClass("Symbol")
 public abstract class SymbolNodes {
@@ -122,7 +116,6 @@ public DynamicObject toProcUncached(VirtualFrame frame, DynamicObject symbol) {
         protected DynamicObject createProc(DeclarationContext declarationContext, InternalMethod method, DynamicObject symbol) {
             final SourceSection sourceSection = getContext().getCallStack().getCallerFrameIgnoringSend()
                     .getCallNode().getEncapsulatingSourceSection();
-            final SourceIndexLength sourceIndexLength = new SourceIndexLength(sourceSection);
 
             final SharedMethodInfo sharedMethodInfo = new SharedMethodInfo(
                     sourceSection,
@@ -140,15 +133,17 @@ protected DynamicObject createProc(DeclarationContext declarationContext, Intern
             // binding as this simplifies the logic elsewhere in the runtime.
             final MaterializedFrame declarationFrame = Truffle.getRuntime().createMaterializedFrame(args, coreLibrary().getEmptyDescriptor());
             final RubyRootNode rootNode = new RubyRootNode(getContext(), sourceSection, new FrameDescriptor(nil()), sharedMethodInfo,
-                    Translator.sequence(sourceIndexLength, Arrays.asList(new CheckReceiverArgumentNode(), new SymbolProcNode(Layouts.SYMBOL.getString(symbol)))));
+                    new SymbolProcNode(Layouts.SYMBOL.getString(symbol)));
 
             final CallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
 
             return ProcOperations.createRubyProc(
                     coreLibrary().getProcFactory(),
                     ProcType.PROC,
                     sharedMethodInfo,
-                    callTarget, callTarget, declarationFrame,
+                    callTarget,
+                    callTarget,
+                    declarationFrame,
                     method,
                     null,
                     null,
@@ -171,29 +166,6 @@ protected FrameDescriptor getDescriptor(VirtualFrame frame) {
             return frame.getFrameDescriptor();
         }
 
-        /** Not using CheckArityNode as the message is different and arity is reported as -1. */
-        private static class CheckReceiverArgumentNode extends RubyNode {
-
-            private final BranchProfile noReceiverProfile = BranchProfile.create();
-
-            @Override
-            public void doExecuteVoid(VirtualFrame frame) {
-                final int given = RubyArguments.getArgumentsCount(frame);
-
-                if (given == 0) {
-                    noReceiverProfile.enter();
-                    throw new RaiseException(getContext(), coreExceptions().argumentError("no receiver given", this));
-                }
-            }
-
-            @Override
-            public Object execute(VirtualFrame frame) {
-                doExecuteVoid(frame);
-                return nil();
-            }
-
-        }
-
     }
 
     @CoreMethod(names = "to_s")

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

@@ -12,14 +12,18 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
+
 import org.truffleruby.core.array.ArrayUtils;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.arguments.RubyArguments;
+import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.CallDispatchHeadNode;
 
 public class SymbolProcNode extends RubyNode {
 
     private final String symbol;
+    private final BranchProfile noReceiverProfile = BranchProfile.create();
 
     @Child private CallDispatchHeadNode callNode;
 
@@ -29,15 +33,17 @@ public SymbolProcNode(String symbol) {
 
     @Override
     public Object execute(VirtualFrame frame) {
-        final Object receiver = RubyArguments.getArgument(frame, 0);
+        // Not using CheckArityNode as the message is different and arity is reported as -1
+        final int given = RubyArguments.getArgumentsCount(frame);
+        if (given == 0) {
+            noReceiverProfile.enter();
+            throw new RaiseException(getContext(), coreExceptions().argumentError("no receiver given", this));
+        }
 
+        final Object receiver = RubyArguments.getArgument(frame, 0);
+        final Object[] arguments = ArrayUtils.extractRange(RubyArguments.getArguments(frame), 1, given);
         final DynamicObject block = RubyArguments.getBlock(frame);
 
-        final Object[] arguments = ArrayUtils.extractRange(
-                RubyArguments.getArguments(frame),
-                1,
-                RubyArguments.getArgumentsCount(frame));
-
         return getCallNode().dispatch(frame, receiver, symbol, block, arguments);
     }