jruby · Jul 5, 2016 · Jul 5, 2016 · Jul 5, 2016
diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
@@ -1474,7 +1474,6 @@ public DynamicObjectFactory getHandleFactory() {
 
     private static final String[] coreFiles = {
             "/core/pre.rb",
-            "/core/tuple.rb",
             "/core/lookuptable.rb",
             "/core/basic_object.rb",
             "/core/mirror.rb",

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
@@ -2279,14 +2279,4 @@ protected static boolean fallback(DynamicObject array, DynamicObject other, Obje
 
     }
 
-    @Primitive(name = "tuple_copy_from")
-    public static abstract class TupleCopyFromPrimitiveNode extends PrimitiveArrayArgumentsNode {
-
-        @Specialization
-        public Object tupleCopyFrom() {
-            return null;
-        }
-
-    }
-
 }
diff --git a/truffle/src/main/ruby/core/array.rb b/truffle/src/main/ruby/core/array.rb
@@ -1434,10 +1434,8 @@ def reverse!
     return self unless size > 1
 
     i = 0
-    while i < self.length / 2
-      temp = self[i]
-      self[i] = self[self.length - i - 1]
-      self[self.length - i - 1] = temp
+    while i < size / 2
+      swap i, size-i-1
       i += 1
     end
 
@@ -1487,7 +1485,7 @@ def slice!(start, length=undefined)
 
         # Check for shift style.
         if start == 0
-          put 0, nil
+          self[0] = nil
           self.shift
         else
           delete_range(start, 1)
@@ -1520,7 +1518,7 @@ def delete_range(index, del_length)
     reg_length = size - reg_start
     if reg_start <= size
       # copy tail
-      copy_from self, reg_start, reg_length, index
+      self[index, reg_length] = self[reg_start, reg_length]
 
       self.pop(del_length)
     end
@@ -1584,4 +1582,11 @@ def sort!(&block)
     Truffle::Array.steal_storage(self, sort(&block))
   end
   public :sort!
+
+  def swap(a, b)
+    temp = at(a)
+    self[a] = at(b)
+    self[b] = temp
+  end
+  protected :swap
 end
diff --git a/truffle/src/main/ruby/core/identity_map.rb b/truffle/src/main/ruby/core/identity_map.rb
@@ -318,7 +318,7 @@ def promote_row(row, index, item, item_hash, ordinal)
 
     def enlarge_row(row, item, item_hash, ordinal)
       new_row = Row.new row.size + ROW_GROWTH
-      new_row.copy_from row, 1, row.size-1, 1
+      new_row[0, row.size] = row
 
       index = row[0]
       new_row[0] = index + 3

diff --git a/truffle/src/main/ruby/core/tuple.rb b/truffle/src/main/ruby/core/tuple.rb