Combine now-identical Nil and RubyProc specializations

These pairs of specializations used to differ in some way (e.g.
converting the `NotProvided block` into a `nil` or `null` for some
downstream call) but they’re the same now that `nil` is always used to
represent a missing block, so we can combine them and avoid the need to
partially evaluate both paths.

Author: tomstuart

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

@@ -493,17 +493,8 @@ protected Object methodMissingNoName(Object self, NotProvided name, Object[] arg
         }
 
         @Specialization(guards = "wasProvided(name)")
-        protected Object methodMissingNoBlock(Object self, Object name, Object[] args, Nil block) {
-            return methodMissing(self, name, args, block);
-        }
-
-        @Specialization(guards = "wasProvided(name)")
-        protected Object methodMissingBlock(Object self, Object name, Object[] args, RubyProc block) {
-            return methodMissing(self, name, args, block);
-        }
-
-        private Object methodMissing(Object self, Object nameObject, Object[] args, Object block) {
-            throw new RaiseException(getContext(), buildMethodMissingException(self, nameObject, args, block));
+        protected Object methodMissing(Object self, Object name, Object[] args, Object block) {
+            throw new RaiseException(getContext(), buildMethodMissingException(self, name, args, block));
         }
 
         private static class FrameAndCallNode {
@@ -618,16 +609,7 @@ public abstract static class SendNode extends CoreMethodArrayArgumentsNode {
         @Child private NameToJavaStringNode nameToJavaString = NameToJavaStringNode.create();
 
         @Specialization
-        protected Object send(VirtualFrame frame, Object self, Object name, Object[] args, Nil block) {
-            return doSend(frame, self, name, args, block);
-        }
-
-        @Specialization
-        protected Object send(VirtualFrame frame, Object self, Object name, Object[] args, RubyProc block) {
-            return doSend(frame, self, name, args, block);
-        }
-
-        private Object doSend(VirtualFrame frame, Object self, Object name, Object[] args, Object block) {
+        protected Object send(VirtualFrame frame, Object self, Object name, Object[] args, Object block) {
             DeclarationContext context = RubyArguments.getDeclarationContext(readCallerFrame.execute(frame));
             RubyArguments.setDeclarationContext(frame, context);
 

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

@@ -1599,16 +1599,7 @@ public abstract static class PublicSendNode extends CoreMethodArrayArgumentsNode
         @Child private NameToJavaStringNode nameToJavaString = NameToJavaStringNode.create();
 
         @Specialization
-        protected Object send(VirtualFrame frame, Object self, Object name, Object[] args, Nil block) {
-            return doSend(frame, self, name, args, block);
-        }
-
-        @Specialization
-        protected Object send(VirtualFrame frame, Object self, Object name, Object[] args, RubyProc block) {
-            return doSend(frame, self, name, args, block);
-        }
-
-        private Object doSend(VirtualFrame frame, Object self, Object name, Object[] args, Object block) {
+        protected Object send(VirtualFrame frame, Object self, Object name, Object[] args, Object block) {
             DeclarationContext context = RubyArguments.getDeclarationContext(readCallerFrame.execute(frame));
             RubyArguments.setDeclarationContext(frame, context);
 

src/main/java/org/truffleruby/core/klass/ClassNodes.java

@@ -19,7 +19,6 @@
 import org.truffleruby.core.inlined.InlinedDispatchNode;
 import org.truffleruby.core.inlined.InlinedMethodNode;
 import org.truffleruby.core.module.RubyModule;
-import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.Visibility;
@@ -283,13 +282,10 @@ public static NewNode create() {
         public abstract Object execute(Object rubyClass, Object[] args, Object block);
 
         @Specialization(guards = "!rubyClass.isSingleton")
-        protected Object newInstance(RubyClass rubyClass, Object[] args, Nil block) {
-            return doNewInstance(rubyClass, args, block);
-        }
-
-        @Specialization(guards = "!rubyClass.isSingleton")
-        protected Object newInstance(RubyClass rubyClass, Object[] args, RubyProc block) {
-            return doNewInstance(rubyClass, args, block);
+        protected Object newInstance(RubyClass rubyClass, Object[] args, Object block) {
+            final Object instance = allocateNode().call(rubyClass, "__allocate__");
+            initialize().callWithBlock(instance, "initialize", block, args);
+            return instance;
         }
 
         @Specialization(guards = "rubyClass.isSingleton")
@@ -304,12 +300,6 @@ public Object inlineExecute(Frame callerFrame, Object self, Object[] args, Objec
             return execute(self, args, block);
         }
 
-        private Object doNewInstance(RubyClass rubyClass, Object[] args, Object block) {
-            final Object instance = allocateNode().call(rubyClass, "__allocate__");
-            initialize().callWithBlock(instance, "initialize", block, args);
-            return instance;
-        }
-
         private DispatchingNode allocateNode() {
             if (allocateNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();

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

@@ -190,17 +190,7 @@ public abstract static class CallNode extends CoreMethodArrayArgumentsNode {
         @Child private CallBlockNode callBlockNode = CallBlockNode.create();
 
         @Specialization
-        protected Object call(RubyProc proc, Object[] args, Nil block) {
-            return callBlockNode.executeCallBlock(
-                    proc.declarationContext,
-                    proc,
-                    ProcOperations.getSelf(proc),
-                    block,
-                    args);
-        }
-
-        @Specialization
-        protected Object call(RubyProc proc, Object[] args, RubyProc block) {
+        protected Object call(RubyProc proc, Object[] args, Object block) {
             return callBlockNode.executeCallBlock(
                     proc.declarationContext,
                     proc,

src/main/java/org/truffleruby/core/range/RangeNodes.java

@@ -152,12 +152,7 @@ protected Object eachObject(VirtualFrame frame, RubyLongRange range, Nil block)
         }
 
         @Specialization
-        protected Object each(VirtualFrame frame, RubyObjectRange range, Nil block) {
-            return eachInternal(frame, range, block);
-        }
-
-        @Specialization
-        protected Object each(VirtualFrame frame, RubyObjectRange range, RubyProc block) {
+        protected Object each(VirtualFrame frame, RubyObjectRange range, Object block) {
             return eachInternal(frame, range, block);
         }
     }