Compiler side of fix for JRUBY-6370, JRUBY-6366.

ashanbrown · Jan 23, 2012 · e82af9a · e82af9a
1 parent 9bc7d7d
commit e82af9a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/org/jruby/runtime/CompiledBlock19.java b/src/org/jruby/runtime/CompiledBlock19.java
@@ -183,9 +183,14 @@ private IRubyObject[] setupBlockArgs(IRubyObject value, boolean alreadyArray) {
         } else if (value instanceof RubyArray && (alreadyArray || (isRest && requiredCount > 0))) {
             parameters = ((RubyArray) value).toJavaArray();
         } else if (isRest || requiredCount > 0) {
-            value = RuntimeHelpers.aryToAry(value);
+            // 1.7.0 rewrite cannot come fast enough...
+            if (value instanceof RubyArray) {
+                parameters = new IRubyObject[] { value };
+            } else {
+                value = RuntimeHelpers.aryToAry(value);
 
-            parameters = (value instanceof RubyArray) ? ((RubyArray)value).toJavaArray() : new IRubyObject[] { value };
+                parameters = (value instanceof RubyArray) ? ((RubyArray)value).toJavaArray() : new IRubyObject[] { value };
+            }
         } else {
             parameters = new IRubyObject[] { value };
         }