Shift proc/lambda logic here for ->(a,){p a}.call([], *[]) => []

jruby · Dec 17, 2015 · 583558a · 583558a
1 parent 4579df0
commit 583558a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -1515,17 +1515,17 @@ private static IRubyObject[] prepareBlockArgsInternal(ThreadContext context, Blo
             return IRubyObject.NULL_ARRAY;
         }
 
-        boolean isProcCall = context.getCurrentBlockType() == Block.Type.PROC;
-        if (isProcCall) {
-            return prepareProcArgs(context, block, args);
-        }
-
         boolean isLambda = block.type == Block.Type.LAMBDA;
         if (isLambda) {
             block.getBody().getSignature().checkArity(context.runtime, args);
             return args;
         }
 
+        boolean isProcCall = context.getCurrentBlockType() == Block.Type.PROC;
+        if (isProcCall) {
+            return prepareProcArgs(context, block, args);
+        }
+
         BlockBody body = block.getBody();
         org.jruby.runtime.Signature sig = body.getSignature();