[GR-19220] Pack missing block argument as nil instead of null (#2232)

PullRequest: truffleruby/2372

Author: eregon

spec/ruby/core/string/split_spec.rb

@@ -471,6 +471,14 @@
         a.should == ["Chunky", "Bacon"]
       end
 
+      it "yields each split substring with default pattern for a non-ASCII string" do
+        a = []
+        returned_object = "l'été arrive bientôt".split { |str| a << str }
+
+        returned_object.should == "l'été arrive bientôt"
+        a.should == ["l'été", "arrive", "bientôt"]
+      end
+
       it "yields the string when limit is 1" do
         a = []
         returned_object = "chunky bacon".split("", 1) { |str| a << str.capitalize }

src/main/java/org/truffleruby/RubyContext.java

@@ -63,6 +63,7 @@
 import org.truffleruby.language.CallStackManager;
 import org.truffleruby.core.string.ImmutableRubyString;
 import org.truffleruby.language.LexicalScope;
+import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.SafepointManager;
 import org.truffleruby.language.arguments.RubyArguments;
@@ -445,7 +446,7 @@ public Object send(Object object, String methodName, Object... arguments) {
 
         return IndirectCallNode.getUncached().call(
                 method.getCallTarget(),
-                RubyArguments.pack(null, null, method, null, object, null, arguments));
+                RubyArguments.pack(null, null, method, null, object, Nil.INSTANCE, arguments));
     }
 
     @TruffleBoundary

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

@@ -26,7 +26,6 @@
 import org.truffleruby.core.string.StringUtils;
 import org.truffleruby.core.support.TypeNodes;
 import org.truffleruby.language.LexicalScope;
-import org.truffleruby.language.NotProvided;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.RubyRootNode;
 import org.truffleruby.language.methods.Split;
@@ -304,7 +303,11 @@ public RubyNode createCoreMethodNode(NodeFactory<? extends RubyNode> nodeFactory
         }
 
         if (method.needsBlock()) {
-            argumentsNodes[i++] = new ReadBlockFromCurrentFrameArgumentsNode(NotProvided.INSTANCE);
+            /* The way we write specializations for getting a block or not is that we use NotProvided like a missing
+             * argument. The block coming into the method is actually always Nil or RubyProc, so here we check which and
+             * convert Nil to NotProvided. */
+            argumentsNodes[i++] = new ReadBlockFromCurrentFrameArgumentsNode.ConvertNilBlockToNotProvidedNode(
+                    new ReadBlockFromCurrentFrameArgumentsNode());
         }
 
         if (!method.keywordAsOptional().isEmpty()) {

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

@@ -9,7 +9,6 @@
  */
 package org.truffleruby.builtins;
 
-import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
@@ -38,9 +37,9 @@ public EnumeratorSizeNode(RubySymbol enumeratorSize, RubySymbol methodName, Ruby
 
     @Override
     public Object execute(VirtualFrame frame) {
-        final RubyProc block = RubyArguments.getBlock(frame);
+        final Object block = RubyArguments.getBlock(frame);
 
-        if (noBlockProfile.profile(block == null)) {
+        if (noBlockProfile.profile(block == nil)) {
             if (toEnumWithSize == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 toEnumWithSize = insert(DispatchNode.create());

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

@@ -10,7 +10,6 @@
 package org.truffleruby.builtins;
 
 import org.truffleruby.core.array.ArrayUtils;
-import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
@@ -37,9 +36,9 @@ public ReturnEnumeratorIfNoBlockNode(String methodName, RubyNode method) {
 
     @Override
     public Object execute(VirtualFrame frame) {
-        final RubyProc block = RubyArguments.getBlock(frame);
+        final Object block = RubyArguments.getBlock(frame);
 
-        if (noBlockProfile.profile(block == null)) {
+        if (noBlockProfile.profile(block == nil)) {
             if (toEnumNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 toEnumNode = insert(DispatchNode.create());

src/main/java/org/truffleruby/cext/CExtNodes.java

@@ -870,7 +870,7 @@ protected Object callSuper(VirtualFrame frame, Object[] args) {
             final MethodLookupResult superMethodLookup = ModuleOperations
                     .lookupSuperMethod(callingMethod, callingMetaclass);
             final InternalMethod superMethod = superMethodLookup.getMethod();
-            return callSuperMethodNode.execute(frame, callingSelf, superMethod, args, null);
+            return callSuperMethodNode.execute(frame, callingSelf, superMethod, args, nil);
         }
 
         @TruffleBoundary

src/main/java/org/truffleruby/core/array/ArrayHelpers.java

@@ -29,8 +29,13 @@ public static void setSize(RubyArray array, int size) {
         array.size = size;
     }
 
+    private static boolean assertNoNullElement(Object store, int size) {
+        return !(store instanceof Object[]) || ArrayUtils.assertNoNullElement((Object[]) store, size);
+    }
+
     public static RubyArray createArray(RubyContext context, RubyLanguage language, Object store, int size) {
         assert !(store instanceof Object[]) || store.getClass() == Object[].class;
+        assert assertNoNullElement(store, size);
         return new RubyArray(context.getCoreLibrary().arrayClass, language.arrayShape, store, size);
     }
 

src/main/java/org/truffleruby/core/array/ArrayNodes.java

@@ -1415,7 +1415,7 @@ public Object injectSymbolHelper(VirtualFrame frame, RubyArray array, String sym
                 loopProfile.profileCounted(array.size - n);
                 for (; loopProfile.inject(n < array.size); n++) {
                     accumulator = dispatch
-                            .dispatch(frame, accumulator, symbol, null, new Object[]{ stores.read(store, n) });
+                            .dispatch(frame, accumulator, symbol, nil, new Object[]{ stores.read(store, n) });
                 }
             } finally {
                 LoopNode.reportLoopCount(this, n);

src/main/java/org/truffleruby/core/array/ArrayUtils.java

@@ -20,6 +20,19 @@ public abstract class ArrayUtils {
 
     public static final Object[] EMPTY_ARRAY = new Object[0];
 
+    public static boolean assertNoNullElement(Object[] array, int size) {
+        assert size <= array.length;
+        for (int i = 0; i < size; i++) {
+            final Object element = array[i];
+            assert element != null : element;
+        }
+        return true;
+    }
+
+    public static boolean assertNoNullElement(Object[] array) {
+        return assertNoNullElement(array, array.length);
+    }
+
     /** Extracts part of an array into a newly allocated byte[] array. Does not perform safety checks on parameters.
      * 
      * @param source the source array whose values should be extracted

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

@@ -619,11 +619,15 @@ public abstract static class SendNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization
         protected Object send(VirtualFrame frame, Object self, Object name, Object[] args, NotProvided block) {
-            return send(frame, self, name, args, (RubyProc) null);
+            return doSend(frame, self, name, args, nil);
         }
 
         @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) {
             DeclarationContext context = RubyArguments.getDeclarationContext(readCallerFrame.execute(frame));
             RubyArguments.setDeclarationContext(frame, context);
 
@@ -660,7 +664,7 @@ protected Shape allocateSingleton(RubyClass rubyClass) {
 
         @Override
         public Object inlineExecute(VirtualFrame frame, Object self, Object[] args, Object proc) {
-            return execute(frame, proc);
+            return execute(frame, self);
         }
 
         @Override