# HG changeset patch # User Thomas Wuerthinger # Date 1427647868 -7200 # Node ID 8a5bda2296270bc452f822b0504206e452ced3b9 # Parent 8b80003824026edd4432dddb98c7fe553a8b821a Rename method to avoid clashes. diff -r 8b8000382402 -r 8a5bda229627 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest1.java --- 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"); } } diff -r 8b8000382402 -r 8a5bda229627 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest3.java --- 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") diff -r 8b8000382402 -r 8a5bda229627 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest4.java --- 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"); } } diff -r 8b8000382402 -r 8a5bda229627 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest5.java --- 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); } } diff -r 8b8000382402 -r 8a5bda229627 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest6.java --- 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"); } } diff -r 8b8000382402 -r 8a5bda229627 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest9.java --- 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") diff -r 8b8000382402 -r 8a5bda229627 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTestBase.java --- 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());