# HG changeset patch
# User Stefan Anzinger <stefan.a.anzinger@oracle.com>
# Date 1417449828 -3600
# Node ID d6555d937ae29745e3a4e6996e562dd0781cc2d6
# Parent  51d05f25830935d1065164c129381ffd59895fae# Parent  bf7db79a6e45059ac0f36c23b7aeb28d4a6b44dd
Merge

diff -r bf7db79a6e45 -r d6555d937ae2 graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64Substitutions.java
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64Substitutions.java	Mon Dec 01 15:03:05 2014 +0100
+++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64Substitutions.java	Mon Dec 01 17:03:48 2014 +0100
@@ -25,8 +25,6 @@
 
 import static com.oracle.graal.compiler.common.GraalOptions.*;
 
-import java.util.*;
-
 import com.oracle.graal.amd64.*;
 import com.oracle.graal.api.code.*;
 import com.oracle.graal.api.meta.*;
@@ -43,8 +41,6 @@
 
     public void registerReplacements(MetaAccessProvider metaAccess, LoweringProvider lowerer, SnippetReflectionProvider snippetReflection, Replacements replacements, TargetDescription target) {
         if (Intrinsify.getValue() && target.arch instanceof AMD64) {
-            replacements.registerSubstitutions(Arrays.class, ArraysSubstitutions.class);
-            replacements.registerSubstitutions(String.class, StringSubstitutions.class);
             replacements.registerSubstitutions(Integer.class, AMD64IntegerSubstitutions.class);
             replacements.registerSubstitutions(Long.class, AMD64LongSubstitutions.class);
         }
diff -r bf7db79a6e45 -r d6555d937ae2 graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraalMethodSubstitutions.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraalMethodSubstitutions.java	Mon Dec 01 15:03:05 2014 +0100
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraalMethodSubstitutions.java	Mon Dec 01 17:03:48 2014 +0100
@@ -25,6 +25,7 @@
 import static com.oracle.graal.compiler.common.GraalOptions.*;
 
 import java.lang.reflect.*;
+import java.util.*;
 
 import com.oracle.graal.api.code.*;
 import com.oracle.graal.api.meta.*;
@@ -42,7 +43,9 @@
     public void registerReplacements(MetaAccessProvider metaAccess, LoweringProvider loweringProvider, SnippetReflectionProvider snippetReflection, Replacements replacements, TargetDescription target) {
         BoxingSubstitutions.registerReplacements(replacements);
         if (Intrinsify.getValue()) {
+            replacements.registerSubstitutions(Arrays.class, ArraysSubstitutions.class);
             replacements.registerSubstitutions(Array.class, ArraySubstitutions.class);
+            replacements.registerSubstitutions(String.class, StringSubstitutions.class);
             replacements.registerSubstitutions(Math.class, MathSubstitutionsX86.class);
             replacements.registerSubstitutions(Double.class, DoubleSubstitutions.class);
             replacements.registerSubstitutions(Float.class, FloatSubstitutions.class);