Don't box null when passed through from specific args.

jruby · Oct 12, 2015 · 5a0e8cb · 5a0e8cb
1 parent b54490a
commit 5a0e8cb
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/runtime/IRBlockBody.java b/core/src/main/java/org/jruby/runtime/IRBlockBody.java
@@ -120,7 +120,10 @@ private IRubyObject[] toAry(ThreadContext context, IRubyObject value) {
     protected IRubyObject doYieldLambda(ThreadContext context, IRubyObject value, Binding binding, Type type) {
         // Lambda does not splat arrays even if a rest arg is present when it wants a single parameter filled.
         IRubyObject[] args;
-        if (signature.required() == 1 || signature.arityValue() == -1) {
+
+        if (value == null) { // no args case from BlockBody.yieldSpecific
+            args = IRubyObject.NULL_ARRAY;
+        } else if (signature.required() == 1 || signature.arityValue() == -1) {
             args = new IRubyObject[] { value };
         } else {
             args = toAry(context, value);
@@ -138,7 +141,9 @@ public IRubyObject doYield(ThreadContext context, IRubyObject value, Binding bin
         int blockArity = getSignature().arityValue();
 
         IRubyObject[] args;
-        if (blockArity >= -1 && blockArity <= 1) {
+        if (value == null) { // no args case from BlockBody.yieldSpecific
+            args = IRubyObject.NULL_ARRAY;
+        } else if (blockArity >= -1 && blockArity <= 1) {
             args = new IRubyObject[] { value };
         } else {
             args = toAry(context, value);