[Truffle] Avoid setting the store when unnecessary in Array#concat.

jruby · Feb 4, 2016 · f85e3b4 · f85e3b4
1 parent 4bbc204
commit f85e3b4
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendManyNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendManyNode.java
@@ -105,17 +105,15 @@ public void appendManySameTypeGeneric(DynamicObject array, ArrayMirror storeMirr
         final int oldSize = Layouts.ARRAY.getSize(array);
         final int newSize = oldSize + otherSize;
 
-        final ArrayMirror newStoreMirror;
-
         if (extendProfile.profile(newSize > storeMirror.getLength())) {
-            newStoreMirror = storeMirror.copyArrayAndMirror(ArrayUtils.capacity(storeMirror.getLength(), newSize));
+            final ArrayMirror newStoreMirror = storeMirror.copyArrayAndMirror(ArrayUtils.capacity(storeMirror.getLength(), newSize));
+            otherStoreMirror.copyTo(newStoreMirror, 0, oldSize, otherSize);
+            Layouts.ARRAY.setStore(array, newStoreMirror.getArray());
+            Layouts.ARRAY.setSize(array, newSize);
         } else {
-            newStoreMirror = storeMirror;
+            otherStoreMirror.copyTo(storeMirror, 0, oldSize, otherSize);
+            Layouts.ARRAY.setSize(array, newSize);
         }
-
-        otherStoreMirror.copyTo(newStoreMirror, 0, oldSize, otherSize);
-        Layouts.ARRAY.setStore(array, newStoreMirror.getArray());
-        Layouts.ARRAY.setSize(array, newSize);
     }
 
     // Append something else into an Object[]
@@ -147,17 +145,16 @@ public void appendManyBoxIntoObjectGeneric(DynamicObject array, int otherSize, A
         final int newSize = oldSize + otherSize;
 
         final Object[] oldStore = (Object[]) Layouts.ARRAY.getStore(array);
-        final Object[] newStore;
 
         if (extendProfile.profile(newSize > oldStore.length)) {
-            newStore = ArrayUtils.grow(oldStore, ArrayUtils.capacity(oldStore.length, newSize));
+            final Object[] newStore = ArrayUtils.grow(oldStore, ArrayUtils.capacity(oldStore.length, newSize));
+            otherStoreMirror.copyTo(newStore, 0, oldSize, otherSize);
+            Layouts.ARRAY.setStore(array, newStore);
+            Layouts.ARRAY.setSize(array, newSize);
         } else {
-            newStore = oldStore;
+            otherStoreMirror.copyTo(oldStore, 0, oldSize, otherSize);
+            Layouts.ARRAY.setSize(array, newSize);
         }
-
-        otherStoreMirror.copyTo(newStore, 0, oldSize, otherSize);
-        Layouts.ARRAY.setStore(array, newStore);
-        Layouts.ARRAY.setSize(array, newSize);
     }
 
     // Append forcing a generalization from int[] to long[]