changeset 20064:8a5bda229627

Rename method to avoid clashes.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sun, 29 Mar 2015 18:51:08 +0200
parents 8b8000382402
children a21dd6860791
files graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest1.java graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest3.java graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest4.java graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest5.java graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest6.java graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest9.java graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTestBase.java
diffstat 7 files changed, 19 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest1.java	Sun Mar 29 18:45:49 2015 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest1.java	Sun Mar 29 18:51:08 2015 +0200
@@ -45,7 +45,7 @@
 
     @Test
     public void test1() {
-        test("test1Snippet", REFERENCE_SNIPPET);
+        testConditionalElimination("test1Snippet", REFERENCE_SNIPPET);
     }
 
     @SuppressWarnings("all")
@@ -68,7 +68,7 @@
 
     @Test
     public void test2() {
-        test("test2Snippet", REFERENCE_SNIPPET);
+        testConditionalElimination("test2Snippet", REFERENCE_SNIPPET);
     }
 
     @SuppressWarnings("all")
@@ -88,7 +88,7 @@
 
     @Test
     public void test3() {
-        test("test3Snippet", REFERENCE_SNIPPET);
+        testConditionalElimination("test3Snippet", REFERENCE_SNIPPET);
     }
 
     @SuppressWarnings("all")
@@ -128,7 +128,7 @@
 
     @Test
     public void test4() {
-        test("test4Snippet", "test4Snippet");
+        testConditionalElimination("test4Snippet", "test4Snippet");
     }
 
     @SuppressWarnings("all")
@@ -151,6 +151,6 @@
 
     @Test
     public void test5() {
-        test("test5Snippet", "test5Snippet");
+        testConditionalElimination("test5Snippet", "test5Snippet");
     }
 }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest3.java	Sun Mar 29 18:45:49 2015 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest3.java	Sun Mar 29 18:51:08 2015 +0200
@@ -54,7 +54,7 @@
 
     @Test
     public void test1() {
-        test("test1Snippet", REFERENCE_SNIPPET);
+        testConditionalElimination("test1Snippet", REFERENCE_SNIPPET);
     }
 
     @SuppressWarnings("all")
@@ -81,7 +81,7 @@
 
     @Test
     public void test2() {
-        test("test2Snippet", REFERENCE_SNIPPET);
+        testConditionalElimination("test2Snippet", REFERENCE_SNIPPET);
     }
 
     @SuppressWarnings("all")
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest4.java	Sun Mar 29 18:45:49 2015 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest4.java	Sun Mar 29 18:51:08 2015 +0200
@@ -51,7 +51,7 @@
 
     @Test
     public void test1() {
-        test("test1Snippet", "reference1Snippet");
+        testConditionalElimination("test1Snippet", "reference1Snippet");
     }
 
     @SuppressWarnings("all")
@@ -74,6 +74,6 @@
 
     @Test
     public void test2() {
-        test("test2Snippet", "reference2Snippet");
+        testConditionalElimination("test2Snippet", "reference2Snippet");
     }
 }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest5.java	Sun Mar 29 18:45:49 2015 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest5.java	Sun Mar 29 18:51:08 2015 +0200
@@ -63,7 +63,7 @@
 
     @Test
     public void test1() {
-        test("test1Snippet", "reference1Snippet");
+        testConditionalElimination("test1Snippet", "reference1Snippet");
     }
 
     public static int reference2Snippet(A a) {
@@ -85,7 +85,7 @@
 
     @Test
     public void test2() {
-        test("test2Snippet", "reference2Snippet");
+        testConditionalElimination("test2Snippet", "reference2Snippet");
     }
 
     @SuppressWarnings("unused")
@@ -115,6 +115,6 @@
 
     @Test
     public void test3() {
-        test("test3Snippet", "reference3Snippet", true);
+        testConditionalElimination("test3Snippet", "reference3Snippet", true);
     }
 }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest6.java	Sun Mar 29 18:45:49 2015 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest6.java	Sun Mar 29 18:51:08 2015 +0200
@@ -62,7 +62,7 @@
 
     @Test
     public void test1() {
-        test("test1Snippet", "reference1Snippet");
+        testConditionalElimination("test1Snippet", "reference1Snippet");
     }
 
     @SuppressWarnings("all")
@@ -79,7 +79,7 @@
 
     @Test
     public void test2() {
-        test("test2Snippet", "reference1Snippet");
+        testConditionalElimination("test2Snippet", "reference1Snippet");
     }
 
     @SuppressWarnings("all")
@@ -96,6 +96,6 @@
 
     @Test
     public void test3() {
-        test("test3Snippet", "reference1Snippet");
+        testConditionalElimination("test3Snippet", "reference1Snippet");
     }
 }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest9.java	Sun Mar 29 18:45:49 2015 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest9.java	Sun Mar 29 18:51:08 2015 +0200
@@ -45,7 +45,7 @@
 
     @Test
     public void test1() {
-        test("test1Snippet", REFERENCE_SNIPPET);
+        testConditionalElimination("test1Snippet", REFERENCE_SNIPPET);
     }
 
     @SuppressWarnings("all")
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTestBase.java	Sun Mar 29 18:45:49 2015 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTestBase.java	Sun Mar 29 18:51:08 2015 +0200
@@ -39,11 +39,11 @@
  */
 public class ConditionalEliminationTestBase extends GraalCompilerTest {
 
-    protected void test(String snippet, String referenceSnippet) {
-        test(snippet, referenceSnippet, false);
+    protected void testConditionalElimination(String snippet, String referenceSnippet) {
+        testConditionalElimination(snippet, referenceSnippet, false);
     }
 
-    protected void test(String snippet, String referenceSnippet, boolean applyConditionalEliminationOnReference) {
+    protected void testConditionalElimination(String snippet, String referenceSnippet, boolean applyConditionalEliminationOnReference) {
         StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
         Debug.dump(graph, "Graph");
         PhaseContext context = new PhaseContext(getProviders());