Mercurial > hg > truffle
changeset 16041:f0efdd541094
less dependency between jtt tests and GraalCompilerTest constructors
line wrap: on
line diff
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/JTTTest.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/JTTTest.java Thu Jun 05 18:14:14 2014 +0200 @@ -44,6 +44,9 @@ */ public class JTTTest extends GraalCompilerTest { + public static final class DummyTestClass { + } + protected static final Set<DeoptimizationReason> EMPTY = Collections.<DeoptimizationReason> emptySet(); /** * The arguments which, if non-null, will replace the Locals in the test method's graph.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_checkcast01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_checkcast01.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,9 +30,12 @@ */ public class BC_checkcast01 extends JTTTest { + private static class TestClass { + } + static Object object2 = new Object(); static Object object3 = ""; - static Object object4 = new BC_checkcast01(); + static Object object4 = new TestClass(); public static int test(int arg) { Object obj; @@ -45,7 +48,7 @@ } else { obj = null; } - final BC_checkcast01 bc = (BC_checkcast01) obj; + final TestClass bc = (TestClass) obj; if (bc != null) { return arg; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_checkcast02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_checkcast02.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,9 +30,12 @@ */ public class BC_checkcast02 extends JTTTest { + private static class TestClass { + } + static Object[] o1 = {new Object()}; static String[] o2 = {""}; - static BC_checkcast02[] o3 = {new BC_checkcast02()}; + static TestClass[] o3 = {new TestClass()}; public static int test(int arg) { Object obj = null;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_instanceof.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_instanceof.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,9 +30,12 @@ */ public class BC_instanceof extends JTTTest { + private static class TestClass { + } + static Object object2 = new Object(); static Object object3 = ""; - static Object object4 = new BC_instanceof(); + static Object object4 = new TestClass(); public static boolean test(int arg) { Object obj; @@ -45,7 +48,7 @@ } else { obj = null; } - return obj instanceof BC_instanceof; + return obj instanceof TestClass; } @Test
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokespecial.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokespecial.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,17 +30,19 @@ */ public class BC_invokespecial extends JTTTest { - static BC_invokespecial object = new BC_invokespecial(); + private static class TestClass { + @SuppressWarnings("static-method") + private int id(int i) { + return i; + } + } + + static TestClass object = new TestClass(); public static int test(int a) { return object.id(a); } - @SuppressWarnings("static-method") - private int id(int i) { - return i; - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokespecial2.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokespecial2.java Thu Jun 05 18:14:14 2014 +0200 @@ -33,17 +33,19 @@ */ public class BC_invokespecial2 extends JTTTest { - static BC_invokespecial2 object = new BC_invokespecial2(); + private static class TestClass { + @SuppressWarnings("static-method") + private int id(int i) { + return 4 + i; + } + } + + static TestClass object = new TestClass(); public static int test(int a) { return 3 + object.id(a); } - @SuppressWarnings("static-method") - private int id(int i) { - return 4 + i; - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokevirtual.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokevirtual.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,16 +30,18 @@ */ public class BC_invokevirtual extends JTTTest { - static BC_invokevirtual object = new BC_invokevirtual(); + private static class TestClass { + public int id(int i) { + return i; + } + } + + static TestClass object = new TestClass(); public static int test(int a) { return object.id(a); } - public int id(int i) { - return i; - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_monitorenter.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_monitorenter.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,7 +30,7 @@ */ public class BC_monitorenter extends JTTTest { - static BC_monitorenter object = new BC_monitorenter(); + static DummyTestClass object = new DummyTestClass(); public static int test(int arg) { synchronized (object) {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_monitorenter02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_monitorenter02.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,7 +30,7 @@ */ public class BC_monitorenter02 extends JTTTest { - static BC_monitorenter02 object = new BC_monitorenter02(); + static DummyTestClass object = new DummyTestClass(); public static int test(int arg, int arg2) { int result = arg;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_multianewarray01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_multianewarray01.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,7 +31,7 @@ public class BC_multianewarray01 extends JTTTest { public static int test(int a) { - final BC_multianewarray01[][] v = new BC_multianewarray01[3][3]; + final DummyTestClass[][] v = new DummyTestClass[3][3]; return v != null ? a : -1; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_multianewarray02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_multianewarray02.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,7 +31,7 @@ public class BC_multianewarray02 extends JTTTest { public static int test(int a) { - final BC_multianewarray02[][][][] v = new BC_multianewarray02[3][3][3][3]; + final DummyTestClass[][][][] v = new DummyTestClass[3][3][3][3]; return v != null ? a : -1; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_new.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_new.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ @SuppressWarnings("unused") public static int test(int a) { - new BC_new(); + new DummyTestClass(); return a; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_01.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,9 +30,11 @@ */ public class BC_putfield_01 extends JTTTest { - private static BC_putfield_01 object = new BC_putfield_01(); + private static class TestClass { + private int field; + } - private int field; + private static TestClass object = new TestClass(); public static int test(int arg) { object.field = arg;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_02.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,9 +30,11 @@ */ public class BC_putfield_02 extends JTTTest { - private static BC_putfield_02 object = new BC_putfield_02(); + private static class TestClass { + private Object field; + } - private Object field; + private static TestClass object = new TestClass(); public static Object test(Object arg) { object.field = arg;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_03.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_03.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,9 +30,11 @@ */ public class BC_putfield_03 extends JTTTest { - private static BC_putfield_03 object = new BC_putfield_03(); + private static class TestClass { + private volatile int field; + } - private volatile int field; + private static TestClass object = new TestClass(); public static int test(int arg) { object.field = arg;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_04.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_04.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,9 +30,11 @@ */ public class BC_putfield_04 extends JTTTest { - private static BC_putfield_04 object = new BC_putfield_04(); + private static class TestClass { + private volatile Object field; + } - private volatile Object field; + private static TestClass object = new TestClass(); public static Object test(Object arg) { object.field = arg;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_anewarray.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_anewarray.java Thu Jun 05 18:14:14 2014 +0200 @@ -35,7 +35,7 @@ @SuppressWarnings("unused") public static int test(int a) { - final BC_anewarray[] v = new BC_anewarray[a]; + final DummyTestClass[] v = new DummyTestClass[a]; if (v != null) { return a; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ static Object object2 = new Object(); static Object object3 = ""; - static Object object4 = new BC_checkcast(); + static Object object4 = new DummyTestClass(); public static int test(int arg) { Object obj = null; @@ -45,7 +45,7 @@ if (arg == 4) { obj = object4; } - final BC_checkcast bc = (BC_checkcast) obj; + final DummyTestClass bc = (DummyTestClass) obj; if (bc == null) { return arg; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast1.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast1.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ static Object object2 = new Object(); static Object object3 = ""; - static Object object4 = new BC_checkcast1(); + static Object object4 = new DummyTestClass(); public static int test(int arg) { Object obj = null; @@ -45,7 +45,7 @@ if (arg == 4) { obj = object4; } - final BC_checkcast1 bc = (BC_checkcast1) obj; + final DummyTestClass bc = (DummyTestClass) obj; if (bc == null) { return arg; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast2.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast2.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ static Object object2 = new Object(); static Object object3 = ""; - static Object object4 = new com.oracle.graal.jtt.except.BC_checkcast2(); + static Object object4 = new DummyTestClass(); public static int test(int arg) { Object obj; @@ -45,7 +45,7 @@ } else { obj = null; } - final BC_checkcast2 bc = (BC_checkcast2) obj; + final DummyTestClass bc = (DummyTestClass) obj; if (bc != null) { return arg; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast3.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast3.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ static Object[] o1 = {new Object()}; static String[] o2 = {""}; - static BC_checkcast3[] o3 = {new BC_checkcast3()}; + static DummyTestClass[] o3 = {new DummyTestClass()}; public static int test(int arg) { Object obj = null; @@ -45,7 +45,7 @@ if (arg == 2) { obj = o3; } - Object[] r = (BC_checkcast3[]) obj; + Object[] r = (DummyTestClass[]) obj; return r == null ? -1 : -1; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast4.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast4.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ static Object object2 = new Object(); static Object object3 = ""; - static Object object4 = new BC_checkcast4(); + static Object object4 = new DummyTestClass(); public static int test(int arg) { Object obj; @@ -45,7 +45,7 @@ } else { obj = null; } - final BC_checkcast4 bc = (BC_checkcast4) obj; + final DummyTestClass bc = (DummyTestClass) obj; if (bc != null) { return arg; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast5.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast5.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ static Object object2 = new Object(); static Object object3 = ""; - static Object object4 = new BC_checkcast5(); + static Object object4 = new DummyTestClass(); public static int test(int arg) { Object obj; @@ -46,7 +46,7 @@ obj = null; } try { - final BC_checkcast5 bc = (BC_checkcast5) obj; + final DummyTestClass bc = (DummyTestClass) obj; if (bc != null) { return arg; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast6.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast6.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ static Object object2 = new Object(); static Object object3 = ""; - static Object object4 = new BC_checkcast6(); + static Object object4 = new DummyTestClass(); public static int test(int arg) { Object obj; @@ -46,7 +46,7 @@ obj = null; } try { - final BC_checkcast6 bc = (BC_checkcast6) obj; + final DummyTestClass bc = (DummyTestClass) obj; if (bc != null) { return arg; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_getfield.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_getfield.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,12 +30,14 @@ public class BC_getfield extends JTTTest { - private static BC_getfield object = new BC_getfield(); + private static class TestClass { + private int field = 13; + } - private int field = 13; + private static TestClass object = new TestClass(); public static int test(int arg) { - final BC_getfield obj = (arg == 3) ? null : object; + final TestClass obj = (arg == 3) ? null : object; return obj.field; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_getfield1.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_getfield1.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,9 +30,11 @@ public class BC_getfield1 extends JTTTest { - private int field = 13; + private static class TestClass { + private int field = 13; + } - public static void test(BC_getfield1 arg) { + public static void test(TestClass arg) { @SuppressWarnings("unused") int i = arg.field; } @@ -50,7 +52,7 @@ @Test public void run2() throws Throwable { - runTest("test", new BC_getfield1()); + runTest("test", new TestClass()); } }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_invokespecial01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_invokespecial01.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,21 +30,23 @@ */ public class BC_invokespecial01 extends JTTTest { - private static final BC_invokespecial01 obj = new BC_invokespecial01(); + private static class TestClass { + @SuppressWarnings("static-method") + private boolean method() { + return true; + } + } + + private static final TestClass obj = new TestClass(); public static boolean test(int arg) { - BC_invokespecial01 object = null; + TestClass object = null; if (arg == 0) { object = obj; } return object.method(); } - @SuppressWarnings("static-method") - private boolean method() { - return true; - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_invokevirtual01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_invokevirtual01.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,20 +30,22 @@ */ public class BC_invokevirtual01 extends JTTTest { - private static final BC_invokevirtual01 obj = new BC_invokevirtual01(); + private static class TestClass { + public boolean method() { + return true; + } + } + + private static final TestClass obj = new TestClass(); public static boolean test(int arg) { - BC_invokevirtual01 object = null; + TestClass object = null; if (arg == 0) { object = obj; } return object.method(); } - public boolean method() { - return true; - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_invokevirtual02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_invokevirtual02.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,21 +30,23 @@ */ public class BC_invokevirtual02 extends JTTTest { - private static final BC_invokevirtual02 obj = new BC_invokevirtual02(); + private static class TestClass { + @SuppressWarnings("static-method") + public final boolean method() { + return true; + } + } + + private static final TestClass obj = new TestClass(); public static boolean test(int arg) { - BC_invokevirtual02 object = null; + TestClass object = null; if (arg == 0) { object = obj; } return object.method(); } - @SuppressWarnings("static-method") - public final boolean method() { - return true; - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_monitorenter.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_monitorenter.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,7 +30,7 @@ */ public class BC_monitorenter extends JTTTest { - static com.oracle.graal.jtt.bytecode.BC_monitorenter object = new com.oracle.graal.jtt.bytecode.BC_monitorenter(); + static DummyTestClass object = new DummyTestClass(); public static boolean test(boolean arg) { final Object o = arg ? object : null;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_multianewarray.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_multianewarray.java Thu Jun 05 18:14:14 2014 +0200 @@ -35,7 +35,7 @@ @SuppressWarnings("unused") public static int test(int a, int b) { - final BC_multianewarray[][] v = new BC_multianewarray[a][b]; + final DummyTestClass[][] v = new DummyTestClass[a][b]; if (v != null) { return a; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_putfield.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_putfield.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,12 +30,14 @@ public class BC_putfield extends JTTTest { - private static BC_putfield object = new BC_putfield(); + private static class TestClass { + private int field; + } - private int field; + private static TestClass object = new TestClass(); public static int test(int arg) { - final BC_putfield obj = arg == 3 ? null : object; + final TestClass obj = arg == 3 ? null : object; obj.field = arg; return obj.field; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NASE_2.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NASE_2.java Thu Jun 05 18:14:14 2014 +0200 @@ -36,7 +36,7 @@ @SuppressWarnings("unused") public static int test(int a) { try { - Catch_NASE_2[] v = new Catch_NASE_2[a]; + DummyTestClass[] v = new DummyTestClass[a]; if (v != null) { return v.length; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized01.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,9 +30,21 @@ */ public class Except_Synchronized01 extends JTTTest { - static final Except_Synchronized01 object = new Except_Synchronized01(); + private static class TestClass { + final int x = 1; - final int x = 1; + @SuppressWarnings("all") + public synchronized int test2(int i) throws Exception { + try { + TestClass object = null; + return object.x; + } catch (NullPointerException e) { + return 2; + } + } + } + + static final TestClass object = new TestClass(); public static int test(int i) throws Exception { if (i == 0) { @@ -41,16 +53,6 @@ return object.test2(i); } - @SuppressWarnings("all") - public synchronized int test2(int i) throws Exception { - try { - Except_Synchronized01 object = null; - return object.x; - } catch (NullPointerException e) { - return 2; - } - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized02.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,9 +30,24 @@ public class Except_Synchronized02 extends JTTTest { - static final Except_Synchronized02 object = new Except_Synchronized02(); + private static class TestClass { + + final int x = 1; - final int x = 1; + @SuppressWarnings("all") + public synchronized int test2(int i) throws Exception { + while (true) { + try { + TestClass object = null; + return object.x; + } catch (NullPointerException e) { + return 2; + } + } + } + } + + static final TestClass object = new TestClass(); public static int test(int i) throws Exception { if (i == 0) { @@ -41,18 +56,6 @@ return object.test2(i); } - @SuppressWarnings("all") - public synchronized int test2(int i) throws Exception { - while (true) { - try { - Except_Synchronized02 object = null; - return object.x; - } catch (NullPointerException e) { - return 2; - } - } - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized03.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized03.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,9 +30,25 @@ */ public class Except_Synchronized03 extends JTTTest { - static final Except_Synchronized03 object = new Except_Synchronized03(); + private static class TestClass { + int x = 1; - int x = 1; + @SuppressWarnings("all") + public synchronized int test2(int i) throws Exception { + while (true) { + try { + synchronized (this) { + TestClass object = null; + return object.x; + } + } catch (NullPointerException e) { + return 2; + } + } + } + } + + static final TestClass object = new TestClass(); public static int test(int i) throws Exception { if (i == 0) { @@ -41,20 +57,6 @@ return object.test2(i); } - @SuppressWarnings("all") - public synchronized int test2(int i) throws Exception { - while (true) { - try { - synchronized (this) { - Except_Synchronized03 object = null; - return object.x; - } - } catch (NullPointerException e) { - return 2; - } - } - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized04.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized04.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,9 +30,24 @@ public class Except_Synchronized04 extends JTTTest { - static final Except_Synchronized04 object = new Except_Synchronized04(); + private static class TestClass { + + final int x = 1; - final int x = 1; + @SuppressWarnings("all") + public int test2(int i) throws Exception { + try { + synchronized (Except_Synchronized04.class) { + TestClass object = null; + return object.x; + } + } catch (NullPointerException e) { + return 2; + } + } + } + + static final TestClass object = new TestClass(); public static int test(int i) throws Exception { if (i == 0) { @@ -41,18 +56,6 @@ return object.test2(i); } - @SuppressWarnings("all") - public int test2(int i) throws Exception { - try { - synchronized (Except_Synchronized04.class) { - Except_Synchronized04 object = null; - return object.x; - } - } catch (NullPointerException e) { - return 2; - } - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/StackTrace_CCE_00.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/StackTrace_CCE_00.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ static Object object2 = new Object(); static Object object3 = ""; - static Object object4 = new StackTrace_CCE_00(); + static Object object4 = new DummyTestClass(); public static int test(int arg) { Object obj = null; @@ -46,7 +46,7 @@ obj = object4; } try { - final StackTrace_CCE_00 bc = (StackTrace_CCE_00) obj; + final DummyTestClass bc = (DummyTestClass) obj; if (bc == null) { return arg; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized04.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized04.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,7 +30,14 @@ public class Throw_Synchronized04 extends JTTTest { - static final Throw_Synchronized04 object = new Throw_Synchronized04(); + private static class TestClass { + @SuppressWarnings("unused") + public synchronized boolean test2(int i) throws Exception { + throw new Exception(); + } + } + + static final TestClass object = new TestClass(); public static boolean test(int i) throws Exception { if (i == 0) { @@ -39,11 +46,6 @@ return object.test2(i); } - @SuppressWarnings("unused") - public synchronized boolean test2(int i) throws Exception { - throw new Exception(); - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized05.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized05.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,7 +30,19 @@ public class Throw_Synchronized05 extends JTTTest { - static final Throw_Synchronized05 object = new Throw_Synchronized05(); + private static class TestClass { + @SuppressWarnings("unused") + public synchronized boolean test2(int i) throws Exception { + try { + throw new Exception(); + } catch (Exception e) { + // do nothing and then rethrow + throw e; + } + } + } + + static final TestClass object = new TestClass(); public static boolean test(int i) throws Exception { if (i == 0) { @@ -39,16 +51,6 @@ return object.test2(i); } - @SuppressWarnings("unused") - public synchronized boolean test2(int i) throws Exception { - try { - throw new Exception(); - } catch (Exception e) { - // do nothing and then rethrow - throw e; - } - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field02.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,25 +32,27 @@ */ public class HP_field02 extends JTTTest { - public int a; - public int b; - public int c; + private static class TestClass { + public int a; + public int b; + public int c; - public static int test(int count) { - return new HP_field02().run(count); + public int run(int count) { + for (int i = 0; i <= count; i++) { + if (i > 5) { + a += i; + } else if (i > 7) { + b += i; + } else { + c += i; + } + } + return a + b + c; + } } - public int run(int count) { - for (int i = 0; i <= count; i++) { - if (i > 5) { - a += i; - } else if (i > 7) { - b += i; - } else { - c += i; - } - } - return a + b + c; + public static int test(int count) { + return new TestClass().run(count); } @Test
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field04.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field04.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,29 +31,31 @@ */ public class HP_field04 extends JTTTest { - public byte b; - public char c; - public short s; - public int i; - public long l; - public float f; - public double d; + private static class TestClass { + public byte b; + public char c; + public short s; + public int i; + public long l; + public float f; + public double d; - public static int test(int count) { - return new HP_field04().run(count); + public int run(int count) { + for (int x = 0; x <= count; x++) { + b += x; + c += x; + s += x; + i += x; + l += x; + f += x; + d += x; + } + return (int) (b + c + s + i + l + f + d); + } } - public int run(int count) { - for (int x = 0; x <= count; x++) { - b += x; - c += x; - s += x; - i += x; - l += x; - f += x; - d += x; - } - return (int) (b + c + s + i + l + f + d); + public static int test(int count) { + return new TestClass().run(count); } @Test
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/UnsafeAccess01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/UnsafeAccess01.java Thu Jun 05 18:14:14 2014 +0200 @@ -34,13 +34,15 @@ */ public class UnsafeAccess01 extends JTTTest { - @SuppressWarnings("unused") private int field = 42; + private static class TestClass { + @SuppressWarnings("unused") private int field = 42; + } public static int test() throws SecurityException, NoSuchFieldException { final Unsafe unsafe = getUnsafe(); - final UnsafeAccess01 object = new UnsafeAccess01(); - final Field field = UnsafeAccess01.class.getDeclaredField("field"); + final TestClass object = new TestClass(); + final Field field = TestClass.class.getDeclaredField("field"); final long offset = unsafe.objectFieldOffset(field); final int value = unsafe.getInt(object, offset); return value;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_cast01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_cast01.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ static final String string = ""; static final Object object = new Object(); - static final Class_cast01 thisObject = new Class_cast01(); + static final DummyTestClass thisObject = new DummyTestClass(); public static int test(int i) { if (i == 0) { @@ -51,7 +51,7 @@ } } if (i == 3) { - if (Class_cast01.class.cast(object) == null) { + if (DummyTestClass.class.cast(object) == null) { return -1; } }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_cast02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_cast02.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ static final String string = ""; static final Object object = new Object(); - static final Class_cast02 thisObject = new Class_cast02(); + static final DummyTestClass thisObject = new DummyTestClass(); public static int test(int i) { if (i == 0) { @@ -51,7 +51,7 @@ } } if (i == 3) { - if (Class_cast02.class.cast(null) == null) { + if (DummyTestClass.class.cast(null) == null) { return -1; } }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance01.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ static final String string = ""; static final Object obj = new Object(); - static final Class_isInstance01 thisObject = new Class_isInstance01(); + static final DummyTestClass thisObject = new DummyTestClass(); public static boolean test(int i) { Object object = null;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance02.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ static final String string = ""; static final Object obj = new Object(); - static final Class_isInstance02 thisObject = new Class_isInstance02(); + static final DummyTestClass thisObject = new DummyTestClass(); public static boolean test(int i) { Object object = null;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance03.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance03.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ static final String string = ""; static final Object obj = new Object(); - static final Class_isInstance03 thisObject = new Class_isInstance03(); + static final DummyTestClass thisObject = new DummyTestClass(); public static boolean test(int i) { Object object = null; @@ -45,7 +45,7 @@ if (i == 2) { object = thisObject; } - return Class_isInstance03.class.isInstance(object); + return DummyTestClass.class.isInstance(object); } @Test
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance06.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance06.java Thu Jun 05 18:14:14 2014 +0200 @@ -28,12 +28,15 @@ import com.oracle.graal.jtt.*; -public final class Class_isInstance06 extends JTTTest implements Cloneable { +public final class Class_isInstance06 extends JTTTest { + + private static class TestClass implements Cloneable { + } static final String string = ""; static final Object obj = new Object(); static final String[] sarray = {}; - static final Object thisObject = new Class_isInstance06(); + static final Object thisObject = new TestClass(); public static boolean test(int i) { Object object = null;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance07.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance07.java Thu Jun 05 18:14:14 2014 +0200 @@ -28,12 +28,12 @@ import com.oracle.graal.jtt.*; -public final class Class_isInstance07 extends JTTTest implements Cloneable { +public final class Class_isInstance07 extends JTTTest { static final String string = ""; static final Object obj = new Object(); static final String[] sarray = {}; - static final Object thisObject = new Class_isInstance07(); + static final Object thisObject = new DummyTestClass(); public static boolean test(int i, Class<?> c) { Object object = null;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_clone01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_clone01.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,17 +30,19 @@ public class Object_clone01 extends JTTTest { - static final Object_clone01 field = new Object_clone01(); + private static class TestClass { + @SuppressWarnings("unused") + private boolean tryClone(int i) throws CloneNotSupportedException { + return this == this.clone(); + } + } + + static final TestClass field = new TestClass(); public static boolean test(int i) throws CloneNotSupportedException { return field.tryClone(i); } - @SuppressWarnings("unused") - private boolean tryClone(int i) throws CloneNotSupportedException { - return this == this.clone(); - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_clone02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_clone02.java Thu Jun 05 18:14:14 2014 +0200 @@ -28,19 +28,21 @@ import com.oracle.graal.jtt.*; -public class Object_clone02 extends JTTTest implements Cloneable { +public class Object_clone02 extends JTTTest { - static final Object_clone02 field = new Object_clone02(); + private static class TestClass implements Cloneable { + @SuppressWarnings("unused") + private boolean tryClone(int i) throws CloneNotSupportedException { + return this == this.clone(); + } + } + + static final TestClass field = new TestClass(); public static boolean test(int i) throws CloneNotSupportedException { return field.tryClone(i); } - @SuppressWarnings("unused") - private boolean tryClone(int i) throws CloneNotSupportedException { - return this == this.clone(); - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_equals01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_equals01.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,7 +30,7 @@ public final class Object_equals01 extends JTTTest { - public static Object_equals01 field = new Object_equals01(); + public static DummyTestClass field = new DummyTestClass(); public static boolean test(int i) { final Object obj1 = new Object();
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_getClass01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_getClass01.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,7 +32,7 @@ static final Object object = new Object(); static final Object string = new String(); - static final Object_getClass01 thisObject = new Object_getClass01(); + static final DummyTestClass thisObject = new DummyTestClass(); public static String test(int i) { if (i == 0) {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_toString01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_toString01.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,6 +30,13 @@ public class Object_toString01 extends JTTTest { + private static class TestClass { + @Override + public String toString() { + return string; + } + } + static final String string = "Object_toString01"; static final Object object = new Object(); @@ -38,16 +45,11 @@ return object.toString() != null; } if (i == 1) { - return new Object_toString01().toString() == string; + return new TestClass().toString() == string; } return false; } - @Override - public String toString() { - return string; - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_toString02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_toString02.java Thu Jun 05 18:14:14 2014 +0200 @@ -33,7 +33,14 @@ public class Object_toString02 extends JTTTest { - static final Object obj = new Object_toString02(); + private static class TestClass { + @Override + public String toString() { + return "XYZ"; + } + } + + static final Object obj = new TestClass(); public static String test(int i) { Object object = null; @@ -47,11 +54,6 @@ return object.toString(); } - @Override - public String toString() { - return "XYZ"; - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop16.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop16.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,30 +32,32 @@ */ public class Loop16 extends JTTTest { - public int a; - public int b; - public int c; + private static class TestClass { + public int a; + public int b; + public int c; - public static int test(int count) { - return new Loop16().run(count); + public int run(int count) { + l1: for (int i = 0; i <= count; i++) { + if (i > 5) { + for (int j = 0; j < i; j++) { + a += i; + if (a > 500) { + break l1; + } + } + } else if (i > 7) { + b += i; + } else { + c += i; + } + } + return a + b + c; + } } - public int run(int count) { - l1: for (int i = 0; i <= count; i++) { - if (i > 5) { - for (int j = 0; j < i; j++) { - a += i; - if (a > 500) { - break l1; - } - } - } else if (i > 7) { - b += i; - } else { - c += i; - } - } - return a + b + c; + public static int test(int count) { + return new TestClass().run(count); } @Test
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/StrangeFrames.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/StrangeFrames.java Thu Jun 05 18:14:14 2014 +0200 @@ -44,11 +44,11 @@ } static void oneOperandStackSlot() { - new StrangeFrames(); + new DummyTestClass(); } static void twoOperandStackSlots() { - two(new StrangeFrames(), new StrangeFrames()); + two(new DummyTestClass(), new DummyTestClass()); } static void oneLocalSlot() {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Conditional01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Conditional01.java Thu Jun 05 18:14:14 2014 +0200 @@ -33,13 +33,62 @@ @SuppressWarnings("unused") public class Conditional01 extends JTTTest { + private static class TestClass { + private int nextPC; + private int pc; + private boolean aC; + private boolean aH; + private boolean aN; + private boolean aZ; + private boolean aV; + private boolean aS; + private int cyclesConsumed; + private int[] sram = new int[RAM_SIZE]; + + public void visit(CPC i) { + nextPC = pc + 2; + int tmp0 = getRegisterByte(i.r1); + int tmp1 = getRegisterByte(i.r2); + int tmp2 = bit(aC); + int tmp3 = tmp0 - tmp1 - tmp2; + boolean tmp4 = ((tmp0 & 128) != 0); + boolean tmp5 = ((tmp1 & 128) != 0); + boolean tmp6 = ((tmp3 & 128) != 0); + boolean tmp7 = ((tmp0 & 8) != 0); + boolean tmp8 = ((tmp1 & 8) != 0); + boolean tmp9 = ((tmp3 & 8) != 0); + aH = !tmp7 && tmp8 || tmp8 && tmp9 || tmp9 && !tmp7; + aC = !tmp4 && tmp5 || tmp5 && tmp6 || tmp6 && !tmp4; + aN = tmp6; + aZ = low(tmp3) == 0 && aZ; + aV = tmp4 && !tmp5 && !tmp6 || !tmp4 && tmp5 && tmp6; + aS = (aN != aV); + cyclesConsumed++; + } + + public int getRegisterByte(Register r1) { + if ((r1.val % 10) == 0) { + return sram[r1.num]; + } + return r1.val; + } + + public int low(int tmp3) { + return tmp3 & 0x01; + } + + public int bit(boolean c2) { + return c2 ? 1 : 0; + } + } + private static final int RAM_SIZE = 0x100; private static final int init = new Random().nextInt(); private static final int init1 = new Register().val; private static final Register init2 = new CPC().r1; public static int test(int arg) { - Conditional01 c = new Conditional01(); + TestClass c = new TestClass(); Random rnd = new Random(); for (int i = 0; i < arg; i++) { CPC i2 = new CPC(); @@ -71,53 +120,6 @@ } - private int nextPC; - private int pc; - private boolean aC; - private boolean aH; - private boolean aN; - private boolean aZ; - private boolean aV; - private boolean aS; - private int cyclesConsumed; - private int[] sram = new int[RAM_SIZE]; - - public void visit(CPC i) { - nextPC = pc + 2; - int tmp0 = getRegisterByte(i.r1); - int tmp1 = getRegisterByte(i.r2); - int tmp2 = bit(aC); - int tmp3 = tmp0 - tmp1 - tmp2; - boolean tmp4 = ((tmp0 & 128) != 0); - boolean tmp5 = ((tmp1 & 128) != 0); - boolean tmp6 = ((tmp3 & 128) != 0); - boolean tmp7 = ((tmp0 & 8) != 0); - boolean tmp8 = ((tmp1 & 8) != 0); - boolean tmp9 = ((tmp3 & 8) != 0); - aH = !tmp7 && tmp8 || tmp8 && tmp9 || tmp9 && !tmp7; - aC = !tmp4 && tmp5 || tmp5 && tmp6 || tmp6 && !tmp4; - aN = tmp6; - aZ = low(tmp3) == 0 && aZ; - aV = tmp4 && !tmp5 && !tmp6 || !tmp4 && tmp5 && tmp6; - aS = (aN != aV); - cyclesConsumed++; - } - - public int getRegisterByte(Register r1) { - if ((r1.val % 10) == 0) { - return sram[r1.num]; - } - return r1.val; - } - - public int low(int tmp3) { - return tmp3 & 0x01; - } - - public int bit(boolean c2) { - return c2 ? 1 : 0; - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Cast01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Cast01.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,20 +31,22 @@ */ public class Fold_Cast01 extends JTTTest { - static final Object object = new Fold_Cast01(); + private static class TestClass { + int field = 9; + } - int field = 9; + static final Object object = new TestClass(); public static int test(int arg) { if (arg == 0) { - return ((Fold_Cast01) object).field; + return ((TestClass) object).field; } if (arg == 1) { - Object obj = new Fold_Cast01(); - return ((Fold_Cast01) obj).field; + Object obj = new TestClass(); + return ((TestClass) obj).field; } if (arg == 2) { - return ((Fold_Cast01) null).field; + return ((TestClass) null).field; } return 0; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_InstanceOf01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_InstanceOf01.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,18 +31,18 @@ */ public class Fold_InstanceOf01 extends JTTTest { - static final Object object = new Fold_InstanceOf01(); + static final Object object = new DummyTestClass(); public static boolean test(int arg) { if (arg == 0) { - return object instanceof Fold_InstanceOf01; + return object instanceof DummyTestClass; } if (arg == 1) { - Object obj = new Fold_InstanceOf01(); - return obj instanceof Fold_InstanceOf01; + Object obj = new DummyTestClass(); + return obj instanceof DummyTestClass; } if (arg == 2) { - return null instanceof Fold_InstanceOf01; + return null instanceof DummyTestClass; } return false; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/LLE_01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/LLE_01.java Thu Jun 05 18:14:14 2014 +0200 @@ -33,10 +33,12 @@ */ public class LLE_01 extends JTTTest { - int field1; + private static class TestClass { + int field1; + } public static int test() { - LLE_01 o = new LLE_01(); + TestClass o = new TestClass(); o.field1 = 1; o.field1 = 0; return o.field1;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/List_reorder_bug.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/List_reorder_bug.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,6 +31,38 @@ @SuppressWarnings("unused") public class List_reorder_bug extends JTTTest { + private static class TestClass { + String s; + + private void print(String s2) { + this.s = s2; + } + + private void match(Object a, int src, int id, int seq) { + print("match: " + src + ", " + id); + List item = list; + List itemPrev = null; + while (item != null) { + if (item.id == id) { + if (item.bool) { + outcall(item.id); + } + if (itemPrev != null) { + itemPrev.next = item.next; + } else { + list = item.next; + } + + item.next = null; + return; + } + + itemPrev = item; + item = item.next; + } + } + } + static class List { List(int id) { @@ -47,46 +79,16 @@ public static boolean test(int i) { list = new List(5); list.next = new List(6); - new List_reorder_bug().match(new Object(), 27, 6, 0); + new TestClass().match(new Object(), 27, 6, 0); return list.next == null; } - private void match(Object a, int src, int id, int seq) { - print("match: " + src + ", " + id); - List item = list; - List itemPrev = null; - while (item != null) { - if (item.id == id) { - if (item.bool) { - outcall(item.id); - } - if (itemPrev != null) { - itemPrev.next = item.next; - } else { - list = item.next; - } - - item.next = null; - return; - } - - itemPrev = item; - item = item.next; - } - } - static int globalId; private static void outcall(int id) { globalId = id; } - String s; - - private void print(String s2) { - this.s = s2; - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_01.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,13 +31,15 @@ */ public class NCE_01 extends JTTTest { - public static NCE_01 object = new NCE_01(); + private static class TestClass { + int field1 = 22; + int field2 = 23; + } - int field1 = 22; - int field2 = 23; + public static TestClass object = new TestClass(); public static int test() { - NCE_01 o = object; + TestClass o = object; int i = o.field1; // expected null check elimination here return o.field2 + i;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_02.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,13 +31,15 @@ */ public class NCE_02 extends JTTTest { - public static NCE_02 object = new NCE_02(); + public static class TestClass { + int field1; + int field2 = 23; + } - int field1; - int field2 = 23; + public static TestClass object = new TestClass(); public static int test() { - NCE_02 o = object; + TestClass o = object; o.field1 = 11; // expect non-null o.field1 = 22;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_03.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_03.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,14 +31,16 @@ */ public class NCE_03 extends JTTTest { - private static boolean cond = true; - public static NCE_03 object = new NCE_03(); + public static class TestClass { + int field1; + int field2 = 23; + } - int field1; - int field2 = 23; + private static boolean cond = true; + public static TestClass object = new TestClass(); public static int test() { - NCE_03 o = object; + TestClass o = object; o.field1 = 11; if (cond) { // expect non-null
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_04.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_04.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,14 +31,16 @@ */ public class NCE_04 extends JTTTest { - private static boolean cond = true; - public static NCE_04 object = new NCE_04(); + public static class TestClass { + int field1; + int field2 = 23; + } - int field1; - int field2 = 23; + private static boolean cond = true; + public static TestClass object = new TestClass(); public static int test() { - NCE_04 o = object; + TestClass o = object; if (cond) { o.field1 = 22; } else {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Cast01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Cast01.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,9 +31,11 @@ */ public class VN_Cast01 extends JTTTest { - static final Object object = new VN_Cast01(); + private static class TestClass { + int field = 9; + } - int field = 9; + static final Object object = new TestClass(); public static int test(int arg) { if (arg == 0) { @@ -50,23 +52,23 @@ private static int test1() { Object o = object; - VN_Cast01 a = (VN_Cast01) o; - VN_Cast01 b = (VN_Cast01) o; + TestClass a = (TestClass) o; + TestClass b = (TestClass) o; return a.field + b.field; } private static int test2() { - Object obj = new VN_Cast01(); - VN_Cast01 a = (VN_Cast01) obj; - VN_Cast01 b = (VN_Cast01) obj; + Object obj = new TestClass(); + TestClass a = (TestClass) obj; + TestClass b = (TestClass) obj; return a.field + b.field; } @SuppressWarnings("all") private static int test3() { Object o = null; - VN_Cast01 a = (VN_Cast01) o; - VN_Cast01 b = (VN_Cast01) o; + TestClass a = (TestClass) o; + TestClass b = (TestClass) o; return a.field + b.field; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Cast02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Cast02.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,10 +31,12 @@ */ public class VN_Cast02 extends JTTTest { + private static class TestClass { + int field = 9; + } + private static boolean cond = true; - static final Object object = new VN_Cast02(); - - int field = 9; + static final Object object = new TestClass(); public static int test(int arg) { if (arg == 0) { @@ -51,19 +53,19 @@ private static int test1() { Object o = object; - VN_Cast02 a = (VN_Cast02) o; + TestClass a = (TestClass) o; if (cond) { - VN_Cast02 b = (VN_Cast02) o; + TestClass b = (TestClass) o; return a.field + b.field; } return 0; } private static int test2() { - Object obj = new VN_Cast02(); - VN_Cast02 a = (VN_Cast02) obj; + Object obj = new TestClass(); + TestClass a = (TestClass) obj; if (cond) { - VN_Cast02 b = (VN_Cast02) obj; + TestClass b = (TestClass) obj; return a.field + b.field; } return 0; @@ -72,9 +74,9 @@ @SuppressWarnings("all") private static int test3() { Object o = null; - VN_Cast02 a = (VN_Cast02) o; + TestClass a = (TestClass) o; if (cond) { - VN_Cast02 b = (VN_Cast02) o; + TestClass b = (TestClass) o; return a.field + b.field; } return 0;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Field01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Field01.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,9 +31,11 @@ */ public class VN_Field01 extends JTTTest { - static final VN_Field01 object = new VN_Field01(); + private static class TestClass { + int field = 9; + } - int field = 9; + static final TestClass object = new TestClass(); public static int test(int arg) { if (arg == 0) { @@ -49,20 +51,20 @@ } private static int test1() { - VN_Field01 a = object; + TestClass a = object; return a.field + a.field; } private static int test2() { - VN_Field01 a = object; - VN_Field01 b = object; + TestClass a = object; + TestClass b = object; return a.field + b.field; } @SuppressWarnings("all") private static int test3() { - VN_Field01 a = null; - VN_Field01 b = null; + TestClass a = null; + TestClass b = null; return a.field + b.field; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Field02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Field02.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,10 +31,12 @@ */ public class VN_Field02 extends JTTTest { + private static class TestClass { + int field = 9; + } + private static boolean cond = true; - static final VN_Field02 object = new VN_Field02(); - - int field = 9; + static final TestClass object = new TestClass(); public static int test(int arg) { if (arg == 0) { @@ -50,7 +52,7 @@ } private static int test1() { - VN_Field02 a = object; + TestClass a = object; int c = a.field; if (cond) { return c + a.field; @@ -59,9 +61,9 @@ } private static int test2() { - VN_Field02 a = object; + TestClass a = object; if (cond) { - VN_Field02 b = object; + TestClass b = object; return a.field + b.field; } return 0; @@ -69,9 +71,9 @@ @SuppressWarnings("all") private static int test3() { - VN_Field02 a = null; + TestClass a = null; if (cond) { - VN_Field02 b = null; + TestClass b = null; return a.field + b.field; } return 0;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf01.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,7 +31,7 @@ */ public class VN_InstanceOf01 extends JTTTest { - static final Object object = new VN_InstanceOf01(); + static final Object object = new DummyTestClass(); public static boolean test(int arg) { if (arg == 0) { @@ -48,21 +48,21 @@ } private static boolean foo1() { - boolean a = object instanceof VN_InstanceOf01; - boolean b = object instanceof VN_InstanceOf01; + boolean a = object instanceof DummyTestClass; + boolean b = object instanceof DummyTestClass; return a | b; } private static boolean foo2() { - Object obj = new VN_InstanceOf01(); - boolean a = obj instanceof VN_InstanceOf01; - boolean b = obj instanceof VN_InstanceOf01; + Object obj = new DummyTestClass(); + boolean a = obj instanceof DummyTestClass; + boolean b = obj instanceof DummyTestClass; return a | b; } private static boolean foo3() { - boolean a = null instanceof VN_InstanceOf01; - boolean b = null instanceof VN_InstanceOf01; + boolean a = null instanceof DummyTestClass; + boolean b = null instanceof DummyTestClass; return a | b; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf02.java Thu Jun 05 18:14:14 2014 +0200 @@ -33,7 +33,7 @@ private static boolean cond = true; - static final Object object = new VN_InstanceOf02(); + static final Object object = new DummyTestClass(); public static boolean test(int arg) { if (arg == 0) { @@ -50,28 +50,28 @@ } private static boolean foo1() { - boolean a = object instanceof VN_InstanceOf02; + boolean a = object instanceof DummyTestClass; if (cond) { - boolean b = object instanceof VN_InstanceOf02; + boolean b = object instanceof DummyTestClass; return a | b; } return false; } private static boolean foo2() { - Object obj = new VN_InstanceOf02(); - boolean a = obj instanceof VN_InstanceOf02; + Object obj = new DummyTestClass(); + boolean a = obj instanceof DummyTestClass; if (cond) { - boolean b = obj instanceof VN_InstanceOf02; + boolean b = obj instanceof DummyTestClass; return a | b; } return false; } private static boolean foo3() { - boolean a = null instanceof VN_InstanceOf02; + boolean a = null instanceof DummyTestClass; if (cond) { - boolean b = null instanceof VN_InstanceOf02; + boolean b = null instanceof DummyTestClass; return a | b; } return false;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf03.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf03.java Thu Jun 05 18:14:14 2014 +0200 @@ -33,17 +33,17 @@ private static boolean cond = true; - static final Object object = new VN_InstanceOf03(); + static final Object object = new DummyTestClass(); public static boolean test() { return foo(); } private static boolean foo() { - Object obj = new VN_InstanceOf03(); - boolean a = obj instanceof VN_InstanceOf03; + Object obj = new DummyTestClass(); + boolean a = obj instanceof DummyTestClass; if (cond) { - boolean b = obj instanceof VN_InstanceOf03; + boolean b = obj instanceof DummyTestClass; return a | b; } return false;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get02.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,34 +30,36 @@ */ public class Field_get02 extends JTTTest { - private static final Field_get02 object = new Field_get02(); + public static class TestClass { + public final byte byteField = 11; + public final short shortField = 12; + public final char charField = 13; + public final int intField = 14; + public final long longField = 15; + public final float floatField = 16; + public final double doubleField = 17; + public final boolean booleanField = true; + } - public final byte byteField = 11; - public final short shortField = 12; - public final char charField = 13; - public final int intField = 14; - public final long longField = 15; - public final float floatField = 16; - public final double doubleField = 17; - public final boolean booleanField = true; + private static final TestClass object = new TestClass(); public static boolean test(int arg) throws NoSuchFieldException, IllegalAccessException { if (arg == 0) { - return Field_get02.class.getField("byteField").get(object).equals(object.byteField); + return TestClass.class.getField("byteField").get(object).equals(object.byteField); } else if (arg == 1) { - return Field_get02.class.getField("shortField").get(object).equals(object.shortField); + return TestClass.class.getField("shortField").get(object).equals(object.shortField); } else if (arg == 2) { - return Field_get02.class.getField("charField").get(object).equals(object.charField); + return TestClass.class.getField("charField").get(object).equals(object.charField); } else if (arg == 3) { - return Field_get02.class.getField("intField").get(object).equals(object.intField); + return TestClass.class.getField("intField").get(object).equals(object.intField); } else if (arg == 4) { - return Field_get02.class.getField("longField").get(object).equals(object.longField); + return TestClass.class.getField("longField").get(object).equals(object.longField); } else if (arg == 5) { - return Field_get02.class.getField("floatField").get(object).equals(object.floatField); + return TestClass.class.getField("floatField").get(object).equals(object.floatField); } else if (arg == 6) { - return Field_get02.class.getField("doubleField").get(object).equals(object.doubleField); + return TestClass.class.getField("doubleField").get(object).equals(object.doubleField); } else if (arg == 7) { - return Field_get02.class.getField("booleanField").get(object).equals(object.booleanField); + return TestClass.class.getField("booleanField").get(object).equals(object.booleanField); } return false; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get03.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get03.java Thu Jun 05 18:14:14 2014 +0200 @@ -43,29 +43,31 @@ static { try { - ByteField = Field_get03.class.getField("byteField"); - ShortField = Field_get03.class.getField("shortField"); - CharField = Field_get03.class.getField("charField"); - IntField = Field_get03.class.getField("intField"); - LongField = Field_get03.class.getField("longField"); - FloatField = Field_get03.class.getField("floatField"); - DoubleField = Field_get03.class.getField("doubleField"); - BooleanField = Field_get03.class.getField("booleanField"); + ByteField = TestClass.class.getField("byteField"); + ShortField = TestClass.class.getField("shortField"); + CharField = TestClass.class.getField("charField"); + IntField = TestClass.class.getField("intField"); + LongField = TestClass.class.getField("longField"); + FloatField = TestClass.class.getField("floatField"); + DoubleField = TestClass.class.getField("doubleField"); + BooleanField = TestClass.class.getField("booleanField"); } catch (SecurityException | NoSuchFieldException e) { throw new RuntimeException(e); } } - private static final Field_get03 object = new Field_get03(); + private static class TestClass { + public final byte byteField = 11; + public final short shortField = 12; + public final char charField = 13; + public final int intField = 14; + public final long longField = 15; + public final float floatField = 16; + public final double doubleField = 17; + public final boolean booleanField = true; + } - public final byte byteField = 11; - public final short shortField = 12; - public final char charField = 13; - public final int intField = 14; - public final long longField = 15; - public final float floatField = 16; - public final double doubleField = 17; - public final boolean booleanField = true; + private static final TestClass object = new TestClass(); public static boolean test(int arg) throws IllegalAccessException { if (arg == 0) {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get04.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get04.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,34 +30,36 @@ */ public class Field_get04 extends JTTTest { - private static final Field_get04 object = new Field_get04(); + private static class TestClass { + public final byte byteField = 11; + public final short shortField = 12; + public final char charField = 13; + public final int intField = 14; + public final long longField = 15; + public final float floatField = 16; + public final double doubleField = 17; + public final boolean booleanField = true; + } - public final byte byteField = 11; - public final short shortField = 12; - public final char charField = 13; - public final int intField = 14; - public final long longField = 15; - public final float floatField = 16; - public final double doubleField = 17; - public final boolean booleanField = true; + private static final TestClass object = new TestClass(); public static boolean test(int arg) throws NoSuchFieldException, IllegalAccessException { if (arg == 0) { - return Field_get04.class.getField("byteField").getByte(object) == object.byteField; + return TestClass.class.getField("byteField").getByte(object) == object.byteField; } else if (arg == 1) { - return Field_get04.class.getField("shortField").getShort(object) == object.shortField; + return TestClass.class.getField("shortField").getShort(object) == object.shortField; } else if (arg == 2) { - return Field_get04.class.getField("charField").getChar(object) == object.charField; + return TestClass.class.getField("charField").getChar(object) == object.charField; } else if (arg == 3) { - return Field_get04.class.getField("intField").getInt(object) == object.intField; + return TestClass.class.getField("intField").getInt(object) == object.intField; } else if (arg == 4) { - return Field_get04.class.getField("longField").getLong(object) == object.longField; + return TestClass.class.getField("longField").getLong(object) == object.longField; } else if (arg == 5) { - return Field_get04.class.getField("floatField").getFloat(object) == object.floatField; + return TestClass.class.getField("floatField").getFloat(object) == object.floatField; } else if (arg == 6) { - return Field_get04.class.getField("doubleField").getDouble(object) == object.doubleField; + return TestClass.class.getField("doubleField").getDouble(object) == object.doubleField; } else if (arg == 7) { - return Field_get04.class.getField("booleanField").getBoolean(object) == object.booleanField; + return TestClass.class.getField("booleanField").getBoolean(object) == object.booleanField; } return false; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set02.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,41 +30,43 @@ */ public class Field_set02 extends JTTTest { - private static final Field_set02 object = new Field_set02(); + private static class TestClass { + public byte byteField; + public short shortField; + public char charField; + public int intField; + public long longField; + public float floatField; + public double doubleField; + public boolean booleanField; + } - public byte byteField; - public short shortField; - public char charField; - public int intField; - public long longField; - public float floatField; - public double doubleField; - public boolean booleanField; + private static final TestClass object = new TestClass(); public static boolean test(int arg) throws NoSuchFieldException, IllegalAccessException { if (arg == 0) { - Field_set02.class.getField("byteField").set(object, Byte.valueOf((byte) 11)); + TestClass.class.getField("byteField").set(object, Byte.valueOf((byte) 11)); return object.byteField == 11; } else if (arg == 1) { - Field_set02.class.getField("shortField").set(object, Short.valueOf((short) 12)); + TestClass.class.getField("shortField").set(object, Short.valueOf((short) 12)); return object.shortField == 12; } else if (arg == 2) { - Field_set02.class.getField("charField").set(object, Character.valueOf((char) 13)); + TestClass.class.getField("charField").set(object, Character.valueOf((char) 13)); return object.charField == 13; } else if (arg == 3) { - Field_set02.class.getField("intField").set(object, Integer.valueOf(14)); + TestClass.class.getField("intField").set(object, Integer.valueOf(14)); return object.intField == 14; } else if (arg == 4) { - Field_set02.class.getField("longField").set(object, Long.valueOf(15L)); + TestClass.class.getField("longField").set(object, Long.valueOf(15L)); return object.longField == 15; } else if (arg == 5) { - Field_set02.class.getField("floatField").set(object, Float.valueOf(16)); + TestClass.class.getField("floatField").set(object, Float.valueOf(16)); return object.floatField == 16; } else if (arg == 6) { - Field_set02.class.getField("doubleField").set(object, Double.valueOf(17)); + TestClass.class.getField("doubleField").set(object, Double.valueOf(17)); return object.doubleField == 17; } else if (arg == 7) { - Field_set02.class.getField("booleanField").set(object, true); + TestClass.class.getField("booleanField").set(object, true); return object.booleanField == true; } return false;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set03.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set03.java Thu Jun 05 18:14:14 2014 +0200 @@ -30,41 +30,43 @@ */ public class Field_set03 extends JTTTest { - private static final Field_set03 object = new Field_set03(); + private static class TestClass { + public byte byteField; + public short shortField; + public char charField; + public int intField; + public long longField; + public float floatField; + public double doubleField; + public boolean booleanField; + } - public byte byteField; - public short shortField; - public char charField; - public int intField; - public long longField; - public float floatField; - public double doubleField; - public boolean booleanField; + private static final TestClass object = new TestClass(); public static boolean test(int arg) throws NoSuchFieldException, IllegalAccessException { if (arg == 0) { - Field_set03.class.getField("byteField").setByte(object, (byte) 11); + TestClass.class.getField("byteField").setByte(object, (byte) 11); return object.byteField == 11; } else if (arg == 1) { - Field_set03.class.getField("shortField").setShort(object, (short) 12); + TestClass.class.getField("shortField").setShort(object, (short) 12); return object.shortField == 12; } else if (arg == 2) { - Field_set03.class.getField("charField").setChar(object, (char) 13); + TestClass.class.getField("charField").setChar(object, (char) 13); return object.charField == 13; } else if (arg == 3) { - Field_set03.class.getField("intField").setInt(object, 14); + TestClass.class.getField("intField").setInt(object, 14); return object.intField == 14; } else if (arg == 4) { - Field_set03.class.getField("longField").setLong(object, 15L); + TestClass.class.getField("longField").setLong(object, 15L); return object.longField == 15; } else if (arg == 5) { - Field_set03.class.getField("floatField").setFloat(object, 16); + TestClass.class.getField("floatField").setFloat(object, 16); return object.floatField == 16; } else if (arg == 6) { - Field_set03.class.getField("doubleField").setDouble(object, 17); + TestClass.class.getField("doubleField").setDouble(object, 17); return object.doubleField == 17; } else if (arg == 7) { - Field_set03.class.getField("booleanField").setBoolean(object, true); + TestClass.class.getField("booleanField").setBoolean(object, true); return object.booleanField == true; } return false;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_except01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_except01.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,6 +32,12 @@ */ public class Invoke_except01 extends JTTTest { + public static class TestClass { + public static int method(int[] arg) { + return arg.length; + } + } + public static int test(int arg) throws IllegalAccessException, InvocationTargetException { Object[] args; if (arg == 0) { @@ -45,7 +51,7 @@ } else { args = null; } - for (Method m : Invoke_except01.class.getDeclaredMethods()) { + for (Method m : TestClass.class.getDeclaredMethods()) { if ("method".equals(m.getName())) { return (Integer) m.invoke(null, args); } @@ -53,10 +59,6 @@ return 42; } - public static int method(int[] arg) { - return arg.length; - } - @Test public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main01.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,19 +32,21 @@ */ public class Invoke_main01 extends JTTTest { + public static class TestClass { + public static void main(String[] args) { + field = args[0]; + } + } + static String field; public static String test(String input) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { field = null; final String[] args = {input}; - Invoke_main01.class.getMethod("main", String[].class).invoke(null, new Object[]{args}); + TestClass.class.getMethod("main", String[].class).invoke(null, new Object[]{args}); return field; } - public static void main(String[] args) { - field = args[0]; - } - @Test public void run0() throws Throwable { runTest("test", "test1");
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main02.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,19 +32,21 @@ */ public class Invoke_main02 extends JTTTest { + public static class TestClass { + public static void main(String[] args) { + field = args[0]; + } + } + static String field; public static String test(String input) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { field = null; final String[] args = {input}; - Invoke_main02.class.getDeclaredMethod("main", String[].class).invoke(null, new Object[]{args}); + TestClass.class.getDeclaredMethod("main", String[].class).invoke(null, new Object[]{args}); return field; } - public static void main(String[] args) { - field = args[0]; - } - @Test public void run0() throws Throwable { runTest("test", "test1");
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main03.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main03.java Thu Jun 05 18:14:14 2014 +0200 @@ -32,12 +32,18 @@ */ public class Invoke_main03 extends JTTTest { + public static class TestClass { + public static void main(String[] args) { + field = args[0]; + } + } + static String field; public static String test(String input) throws IllegalAccessException, InvocationTargetException { field = null; final String[] args = {input}; - for (Method m : Invoke_main03.class.getDeclaredMethods()) { + for (Method m : TestClass.class.getDeclaredMethods()) { if ("main".equals(m.getName())) { m.invoke(null, new Object[]{args}); } @@ -45,10 +51,6 @@ return field; } - public static void main(String[] args) { - field = args[0]; - } - @Test public void run0() throws Throwable { runTest("test", "test1");
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitor_contended01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitor_contended01.java Thu Jun 05 18:14:14 2014 +0200 @@ -28,17 +28,35 @@ import com.oracle.graal.jtt.*; -public final class Monitor_contended01 extends JTTTest implements Runnable { +public final class Monitor_contended01 extends JTTTest { + + private static class TestClass implements Runnable { + boolean started = false; + boolean acquired = false; + + public void run() { + // signal that we have started up so first thread will release lock + synchronized (cond) { + started = true; + cond.notifyAll(); + } + synchronized (obj) { + + } + // signal that we have successfully acquired and released the monitor + synchronized (cond) { + acquired = true; + cond.notifyAll(); + } + } + } static final Object cond = new Object(); static final Object obj = new Object(); - boolean started = false; - boolean acquired = false; - public static boolean test() throws InterruptedException { // test contention for monitor - final Monitor_contended01 object = new Monitor_contended01(); + final TestClass object = new TestClass(); synchronized (obj) { new Thread(object).start(); // wait for other thread to startup and contend @@ -56,22 +74,6 @@ return object.acquired; } - public void run() { - // signal that we have started up so first thread will release lock - synchronized (cond) { - started = true; - cond.notifyAll(); - } - synchronized (obj) { - - } - // signal that we have successfully acquired and released the monitor - synchronized (cond) { - acquired = true; - cond.notifyAll(); - } - } - @Test(timeout = 20000) public void run0() throws Throwable { runTest("test");
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait01.java Thu Jun 05 18:14:14 2014 +0200 @@ -28,7 +28,19 @@ import com.oracle.graal.jtt.*; -public class Object_wait01 extends JTTTest implements Runnable { +public class Object_wait01 extends JTTTest { + + private static class TestClass implements Runnable { + public void run() { + int i = 0; + while (i++ < 1000000 && !done) { + synchronized (object) { + count++; + object.notifyAll(); + } + } + } + } static volatile int count = 0; static volatile boolean done; @@ -37,7 +49,7 @@ public static boolean test(int i) throws InterruptedException { count = 0; done = false; - new Thread(new Object_wait01()).start(); + new Thread(new TestClass()).start(); synchronized (object) { while (count < i) { object.wait(); @@ -45,17 +57,6 @@ done = true; return count >= i; } - - } - - public void run() { - int i = 0; - while (i++ < 1000000 && !done) { - synchronized (object) { - count++; - object.notifyAll(); - } - } } @Test(timeout = 20000)
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait02.java Thu Jun 05 18:14:14 2014 +0200 @@ -28,7 +28,21 @@ import com.oracle.graal.jtt.*; -public class Object_wait02 extends JTTTest implements Runnable { +public class Object_wait02 extends JTTTest { + + private static class TestClass implements Runnable { + public void run() { + try { + Thread.sleep(sleep); + } catch (InterruptedException ex) { + + } + synchronized (object) { + done = true; + object.notifyAll(); + } + } + } static volatile boolean done; static final Object object = new Object(); @@ -37,7 +51,7 @@ public static boolean test(int i) throws InterruptedException { done = false; sleep = i * 200; - new Thread(new Object_wait02()).start(); + new Thread(new TestClass()).start(); synchronized (object) { while (!done) { object.wait(200); @@ -46,18 +60,6 @@ return done; } - public void run() { - try { - Thread.sleep(sleep); - } catch (InterruptedException ex) { - - } - synchronized (object) { - done = true; - object.notifyAll(); - } - } - @Test(timeout = 20000) public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait03.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait03.java Thu Jun 05 18:14:14 2014 +0200 @@ -28,7 +28,21 @@ import com.oracle.graal.jtt.*; -public class Object_wait03 extends JTTTest implements Runnable { +public class Object_wait03 extends JTTTest { + + private static class TestClass implements Runnable { + public void run() { + try { + Thread.sleep(sleep); + } catch (InterruptedException ex) { + + } + synchronized (object) { + done = true; + object.notifyAll(); + } + } + } static volatile boolean done; static final Object object = new Object(); @@ -38,7 +52,7 @@ done = false; sleep = i * 200; synchronized (object) { - new Thread(new Object_wait03()).start(); + new Thread(new TestClass()).start(); dowait(); } return done; @@ -52,18 +66,6 @@ } } - public void run() { - try { - Thread.sleep(sleep); - } catch (InterruptedException ex) { - - } - synchronized (object) { - done = true; - object.notifyAll(); - } - } - @Test(timeout = 20000) public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait04.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait04.java Thu Jun 05 18:14:14 2014 +0200 @@ -28,7 +28,21 @@ import com.oracle.graal.jtt.*; -public class Object_wait04 extends JTTTest implements Runnable { +public class Object_wait04 extends JTTTest { + + private static class TestClass implements Runnable { + public void run() { + try { + Thread.sleep(sleep); + } catch (InterruptedException ex) { + + } + synchronized (object) { + done = true; + object.notifyAll(); + } + } + } static volatile boolean done; static final Object object = new Object(); @@ -38,7 +52,7 @@ done = false; sleep = i * 50; synchronized (object) { - new Thread(new Object_wait04()).start(); + new Thread(new TestClass()).start(); dowait(i); } return done; @@ -56,18 +70,6 @@ } } - public void run() { - try { - Thread.sleep(sleep); - } catch (InterruptedException ex) { - - } - synchronized (object) { - done = true; - object.notifyAll(); - } - } - @Test(timeout = 20000) public void run0() throws Throwable { runTest("test", 0);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join01.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join01.java Thu Jun 05 18:14:14 2014 +0200 @@ -28,22 +28,24 @@ import com.oracle.graal.jtt.*; -public class Thread_join01 extends JTTTest implements Runnable { +public class Thread_join01 extends JTTTest { + + private static class TestClass implements Runnable { + public void run() { + cont = false; + } + } static volatile boolean cont; public static boolean test() throws InterruptedException { cont = true; - final Thread thread = new Thread(new Thread_join01()); + final Thread thread = new Thread(new TestClass()); thread.start(); thread.join(); return cont; } - public void run() { - cont = false; - } - @Test(timeout = 20000) public void run0() throws Throwable { runTest("test");
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join02.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,26 +31,28 @@ import com.oracle.graal.jtt.*; -public class Thread_join02 extends JTTTest implements Runnable { +public class Thread_join02 extends JTTTest { + + private static class TestClass implements Runnable { + public void run() { + try { + Thread.sleep(200); + } catch (InterruptedException ex) { + } + cont = false; + } + } static volatile boolean cont; public static boolean test() throws InterruptedException { cont = true; - final Thread thread = new Thread(new Thread_join02()); + final Thread thread = new Thread(new TestClass()); thread.start(); thread.join(); return cont; } - public void run() { - try { - Thread.sleep(200); - } catch (InterruptedException ex) { - } - cont = false; - } - @Test(timeout = 20000) public void run0() throws Throwable { runTest("test");
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join03.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join03.java Thu Jun 05 18:14:14 2014 +0200 @@ -31,23 +31,25 @@ import com.oracle.graal.jtt.*; -public class Thread_join03 extends JTTTest implements Runnable { +public class Thread_join03 extends JTTTest { + + private static class TestClass implements Runnable { + public void run() { + cont = false; + } + } static volatile boolean cont; public static boolean test() throws InterruptedException { cont = true; - final Thread thread = new Thread(new Thread_join03()); + final Thread thread = new Thread(new TestClass()); thread.start(); Thread.sleep(200); thread.join(); return cont; } - public void run() { - cont = false; - } - @Test(timeout = 20000) public void run0() throws Throwable { runTest("test");
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_new02.java Thu Jun 05 14:30:13 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_new02.java Thu Jun 05 18:14:14 2014 +0200 @@ -28,9 +28,15 @@ import com.oracle.graal.jtt.*; -public class Thread_new02 extends JTTTest implements Runnable { +public class Thread_new02 extends JTTTest { - static final Thread_new02 thisObject = new Thread_new02(); + private static class TestClass implements Runnable { + public void run() { + // do nothing. + } + } + + static final TestClass thisObject = new TestClass(); public static boolean test(int i) { if (i == 0) { @@ -48,10 +54,6 @@ return false; } - public void run() { - // do nothing. - } - @Test public void run0() throws Throwable { runTest("test", 0);