[Truffle] Fix appending an Object[] to an int[] in the array builder - …

…fixes #2769.
jruby · Mar 28, 2015 · 9e423f9 · 9e423f9
1 parent 53683ba
commit 9e423f9
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayBuilderNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayBuilderNode.java
@@ -146,7 +146,6 @@ public static class IntegerArrayBuilderNode extends ArrayBuilderNode {
         private final int expectedLength;
 
         @CompilerDirectives.CompilationFinal private boolean hasAppendedIntegerArray = false;
-        @CompilerDirectives.CompilationFinal private boolean hasAppendedObjectArray = false;
 
         public IntegerArrayBuilderNode(RubyContext context, int expectedLength) {
             super(context);
@@ -200,11 +199,6 @@ public Object append(Object store, int index, RubyArray array) {
                 return store;
             }
 
-            if (hasAppendedObjectArray && otherStore instanceof Object[]) {
-                System.arraycopy(otherStore, 0, store, index, array.getSize());
-                return store;
-            }
-
             CompilerDirectives.transferToInterpreterAndInvalidate();
 
             if (otherStore instanceof int[]) {
@@ -213,13 +207,13 @@ public Object append(Object store, int index, RubyArray array) {
                 return store;
             }
 
-            if (otherStore instanceof Object[]) {
-                hasAppendedObjectArray = true;
-                System.arraycopy(otherStore, 0, store, index, array.getSize());
-                return store;
-            }
+            CompilerDirectives.transferToInterpreter();
 
-            throw new UnsupportedOperationException(array.getStore().getClass().getName());
+            replace(new ObjectArrayBuilderNode(getContext(), expectedLength));
+            final Object[] newStore = ArrayUtils.box((int[]) store);
+            System.arraycopy(otherStore, 0, newStore, index, array.getSize());
+
+            return newStore;
         }
 
         @Override