[Truffle] Move Array#unshift to Ruby.

jruby · Apr 28, 2016 · 9176fc8 · 9176fc8
1 parent a4dbd4f
commit 9176fc8
Showing 2 changed files with 1 addition and 33 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java
@@ -2115,23 +2115,6 @@ protected boolean isSmall(DynamicObject array) {
 
     }
 
-    @CoreMethod(names = "unshift", rest = true, raiseIfFrozenSelf = true)
-    public abstract static class UnshiftNode extends CoreMethodArrayArgumentsNode {
-
-        @Specialization
-        public DynamicObject unshift(DynamicObject array, Object... args) {
-            CompilerDirectives.transferToInterpreter();
-
-            assert RubyGuards.isRubyArray(array);
-            final Object[] newStore = new Object[getSize(array) + args.length];
-            System.arraycopy(args, 0, newStore, 0, args.length);
-            ArrayUtils.copy(getStore(array), newStore, args.length, getSize(array));
-            setStoreAndSize(array, newStore, newStore.length);
-            return array;
-        }
-
-    }
-
     @CoreMethod(names = "zip", rest = true, required = 1, needsBlock = true)
     public abstract static class ZipNode extends ArrayCoreMethodNode {
 

diff --git a/truffle/src/main/ruby/core/rubinius/common/array.rb b/truffle/src/main/ruby/core/rubinius/common/array.rb
@@ -1848,23 +1848,8 @@ def uniq!(&block)
   def unshift(*values)
     Rubinius.check_frozen
 
-    return self if values.empty?
+    self[0, 0] = values
 
-    m = Rubinius::Mirror::Array.reflect values
-
-    if @start > values.size
-      # fit the new values in between 0 and @start if possible
-      @start -= values.size
-      @tuple.copy_from(m.tuple, 0, values.size, @start)
-    else
-      new_tuple = Rubinius::Tuple.new @total + values.size
-      new_tuple.copy_from m.tuple, 0, values.size, 0
-      new_tuple.copy_from @tuple, @start, @total, values.size
-      @start = 0
-      @tuple = new_tuple
-    end
-
-    @total += values.size
     self
   end