jruby · Feb 19, 2015 · Feb 19, 2015
diff --git a/test/truffle/pe/pe.rb b/test/truffle/pe/pe.rb
@@ -82,7 +82,7 @@ def self.counter_example(description)
   end
 
   def self.broken_example(description)
-    describe "#{description} is not constant" do
+    describe "#{description} is constant" do
       @warnings.push "broken example not run: #{full_description}"
     end
   end

diff --git a/.../src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedMethodMissingDispatchNode.java b/.../src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedMethodMissingDispatchNode.java
@@ -10,9 +10,7 @@
 package org.jruby.truffle.nodes.dispatch;
 
 import com.oracle.truffle.api.Assumption;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.IndirectCallNode;
@@ -23,6 +21,7 @@
 import org.jruby.truffle.runtime.core.RubyClass;
 import org.jruby.truffle.runtime.core.RubyProc;
 import org.jruby.truffle.runtime.methods.InternalMethod;
+import org.jruby.truffle.runtime.util.ArrayUtils;
 import org.jruby.util.cli.Options;
 
 public class CachedBoxedMethodMissingDispatchNode extends CachedDispatchNode {
@@ -110,7 +109,7 @@ public Object executeDispatch(
                 final Object[] argumentsObjectsArray = (Object[]) argumentsObjects;
                 final Object[] modifiedArgumentsObjects = new Object[1 + argumentsObjectsArray.length];
                 modifiedArgumentsObjects[0] = getCachedNameAsSymbol();
-                RubyArguments.arraycopy(argumentsObjectsArray, 0, modifiedArgumentsObjects, 1, argumentsObjectsArray.length);
+                ArrayUtils.arraycopy(argumentsObjectsArray, 0, modifiedArgumentsObjects, 1, argumentsObjectsArray.length);
 
                 if (isIndirect()) {
                     return indirectCallNode.call(

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/UncachedDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/UncachedDispatchNode.java
@@ -11,7 +11,6 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.utilities.BranchProfile;
@@ -27,6 +26,7 @@
 import org.jruby.truffle.runtime.core.RubyModule;
 import org.jruby.truffle.runtime.core.RubyProc;
 import org.jruby.truffle.runtime.methods.InternalMethod;
+import org.jruby.truffle.runtime.util.ArrayUtils;
 
 public class UncachedDispatchNode extends DispatchNode {
 
@@ -130,7 +130,7 @@ public Object executeDispatch(
 
                 modifiedArgumentsObjects[0] = toSymbolNode.executeRubySymbol(frame, name);
 
-                RubyArguments.arraycopy(argumentsObjectsArray, 0, modifiedArgumentsObjects, 1, argumentsObjectsArray.length);
+                ArrayUtils.arraycopy(argumentsObjectsArray, 0, modifiedArgumentsObjects, 1, argumentsObjectsArray.length);
 
                 return callNode.call(
                         frame,

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/RubyArguments.java b/truffle/src/main/java/org/jruby/truffle/runtime/RubyArguments.java
@@ -36,7 +36,7 @@ public static Object[] pack(InternalMethod method, MaterializedFrame declaration
         packed[DECLARATION_FRAME_INDEX] = declarationFrame;
         packed[SELF_INDEX] = self;
         packed[BLOCK_INDEX] = block;
-        arraycopy(arguments, 0, packed, RUNTIME_ARGUMENT_COUNT, arguments.length);
+        ArrayUtils.arraycopy(arguments, 0, packed, RUNTIME_ARGUMENT_COUNT, arguments.length);
 
         return packed;
     }
@@ -57,25 +57,6 @@ public static Object[] extractUserArguments(Object[] arguments) {
         return ArrayUtils.extractRange(arguments, RUNTIME_ARGUMENT_COUNT, arguments.length);
     }
 
-    public static Object[] concatUserArguments(Object o, Object[] arguments) {
-        final Object[] concatenatedArguments;
-
-        if (o instanceof Object[]) {
-            Object[] concatArray = (Object[]) o;
-            concatenatedArguments = new Object[concatArray.length + arguments.length - RUNTIME_ARGUMENT_COUNT];
-
-            arraycopy(concatArray, 0, concatenatedArguments, 0, concatArray.length);
-            arraycopy(arguments, RUNTIME_ARGUMENT_COUNT, concatenatedArguments, concatArray.length, getUserArgumentsCount(arguments));
-        } else {
-            concatenatedArguments = new Object[1 + arguments.length - RUNTIME_ARGUMENT_COUNT];
-
-            concatenatedArguments[0] = o;
-            arraycopy(arguments, RUNTIME_ARGUMENT_COUNT, concatenatedArguments, 1, getUserArgumentsCount(arguments));
-        }
-
-        return concatenatedArguments;
-    }
-
     public static int getUserArgumentsCount(Object[] internalArguments) {
         return internalArguments.length - RUNTIME_ARGUMENT_COUNT;
     }
@@ -104,13 +85,6 @@ public static MaterializedFrame getDeclarationFrame(Object[] arguments) {
         return (MaterializedFrame) arguments[DECLARATION_FRAME_INDEX];
     }
 
-    @ExplodeLoop
-    public static void arraycopy(Object[] src, int srcPos, Object[] dest, int destPos, int length) {
-        for (int i = 0; i < length; i++) {
-            dest[destPos + i] = src[srcPos + i];
-        }
-    }
-
     /**
      * Get the declaration frame a certain number of levels up from the current frame, where the
      * current frame is 0.

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/util/ArrayUtils.java b/truffle/src/main/java/org/jruby/truffle/runtime/util/ArrayUtils.java
@@ -11,8 +11,8 @@
 
 import com.oracle.truffle.api.CompilerAsserts;
 
+import com.oracle.truffle.api.nodes.ExplodeLoop;
 import org.jruby.truffle.nodes.RubyNode;
-import org.jruby.truffle.runtime.RubyArguments;
 
 import java.lang.reflect.Array;
 import java.util.Arrays;
@@ -291,7 +291,7 @@ public static void copy(Object source, Object[] destination, int destinationStar
                 destination[destinationStart + n] = unboxedSource[n];
             }
         } else if (source instanceof Object[]) {
-            RubyArguments.arraycopy((Object[]) source, 0, destination, destinationStart, length);
+            arraycopy((Object[]) source, 0, destination, destinationStart, length);
         } else {
             throw new UnsupportedOperationException();
         }
@@ -321,4 +321,10 @@ public static int capacity(int current, int needed) {
         }
     }
 
+    @ExplodeLoop
+    public static void arraycopy(Object[] src, int srcPos, Object[] dest, int destPos, int length) {
+        for (int i = 0; i < length; i++) {
+            dest[destPos + i] = src[srcPos + i];
+        }
+    }
 }