Mercurial > hg > graal-compiler

changeset 22939:6c234690e5b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Disable String intrinsics in 1.9 until CompactStrings are handled
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Tue, 03 Nov 2015 13:44:44 -0800
parents ccdecd8cc1f2
children 36a46bae0a59
files graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StringSubstitutionsTest.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StringSubstitutionsTest.java	Tue Nov 03 12:18:46 2015 -0800
+++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StringSubstitutionsTest.java	Tue Nov 03 13:44:44 2015 -0800
@@ -64,6 +64,11 @@
 
     @Test
     public void testEquals() {
+        if (System.getProperty("java.specification.version").compareTo("1.9") >= 0) {
+            // StringSubstitutions are disabled in 1.9
+            return;
+        }
+
         final int n = 1000;
         Object[] args1 = new Object[n];
         Object[] args2 = new Object[n];
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java	Tue Nov 03 12:18:46 2015 -0800
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java	Tue Nov 03 13:44:44 2015 -0800
@@ -135,7 +135,9 @@
         registerIntegerLongPlugins(plugins, JavaKind.Long);
         registerFloatPlugins(plugins);
         registerDoublePlugins(plugins);
-        registerStringPlugins(plugins);
+        if (System.getProperty("java.specification.version").compareTo("1.9") < 0) {
+            registerStringPlugins(plugins);
+        }
         registerArraysPlugins(plugins);
         registerArrayPlugins(plugins);
         registerUnsafePlugins(plugins);