Mercurial > hg > truffle
changeset 18585:68814fb4bbe4
[SPARC] Fix ArraysSubstitution and StringSubstitution tests by moving the according substitutions to common code
author | Stefan Anzinger <stefan.anzinger@oracle.com> |
---|---|
date | Mon, 01 Dec 2014 15:19:28 +0100 |
parents | b76489300efa |
children | 51d05f258309 |
files | graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64Substitutions.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraalMethodSubstitutions.java |
diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64Substitutions.java Sun Nov 30 21:14:13 2014 +0100 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64Substitutions.java Mon Dec 01 15:19:28 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); }
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraalMethodSubstitutions.java Sun Nov 30 21:14:13 2014 +0100 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraalMethodSubstitutions.java Mon Dec 01 15:19:28 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);