Remove workarounds for fixed bug 18051191
Bug: 18051191
Test: ART run-tests
Change-Id: Iae9b1ed30f26dbe8efb291d71d7224e64eea14df
diff --git a/test/425-invoke-super/expected-stdout.txt b/test/425-invoke-super/expected-stdout.txt
index f7f6ae4..e69de29 100644
--- a/test/425-invoke-super/expected-stdout.txt
+++ b/test/425-invoke-super/expected-stdout.txt
@@ -1 +0,0 @@
-Test started
diff --git a/test/425-invoke-super/src/Main.java b/test/425-invoke-super/src/Main.java
index f3166fd..1fb62d0 100644
--- a/test/425-invoke-super/src/Main.java
+++ b/test/425-invoke-super/src/Main.java
@@ -39,8 +39,6 @@
}
public static void main(String[] args) throws Exception {
- // Workaround for b/18051191.
- System.out.println("Test started");
assertEquals(1, new B().$opt$bar());
assertEquals(1, new C().$opt$bar());
assertEquals(1, new D().$opt$bar());
diff --git a/test/431-type-propagation/expected-stdout.txt b/test/431-type-propagation/expected-stdout.txt
index ccaf6f8..e69de29 100644
--- a/test/431-type-propagation/expected-stdout.txt
+++ b/test/431-type-propagation/expected-stdout.txt
@@ -1 +0,0 @@
-Enter
diff --git a/test/431-type-propagation/src/Main.java b/test/431-type-propagation/src/Main.java
index 91dfe10..2aaba8e 100644
--- a/test/431-type-propagation/src/Main.java
+++ b/test/431-type-propagation/src/Main.java
@@ -18,7 +18,6 @@
public class Main {
public static void main(String[] args) throws Exception {
- System.out.println("Enter");
Class<?> c = Class.forName("TypePropagation");
Method m = c.getMethod("method", int[].class);
int[] array = new int[7];
diff --git a/test/442-checker-constant-folding/src/Main.java b/test/442-checker-constant-folding/src/Main.java
index 45157ab..1bdf7b5 100644
--- a/test/442-checker-constant-folding/src/Main.java
+++ b/test/442-checker-constant-folding/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void assertFalse(boolean condition) {
if (condition) {
throw new Error();
diff --git a/test/448-multiple-returns/src/Main.java b/test/448-multiple-returns/src/Main.java
index 4050ed1..88be385 100644
--- a/test/448-multiple-returns/src/Main.java
+++ b/test/448-multiple-returns/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("MultipleReturns");
Method m = c.getMethod("caller");
diff --git a/test/452-multiple-returns2/src/Main.java b/test/452-multiple-returns2/src/Main.java
index 8904c45..54035a0 100644
--- a/test/452-multiple-returns2/src/Main.java
+++ b/test/452-multiple-returns2/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("MultipleReturns");
Method m = c.getMethod("caller");
diff --git a/test/453-not-byte/src/Main.java b/test/453-not-byte/src/Main.java
index f055743..3f31645 100644
--- a/test/453-not-byte/src/Main.java
+++ b/test/453-not-byte/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("NotByte");
Method m = c.getMethod("notByte", byte.class);
diff --git a/test/457-regs/src/Main.java b/test/457-regs/src/Main.java
index 428c913..2f12ea2 100644
--- a/test/457-regs/src/Main.java
+++ b/test/457-regs/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
System.loadLibrary(args[0]);
diff --git a/test/459-dead-phi/src/Main.java b/test/459-dead-phi/src/Main.java
index 0ecc0bd..b7ef18e 100644
--- a/test/459-dead-phi/src/Main.java
+++ b/test/459-dead-phi/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("EquivalentPhi");
Method m = c.getMethod("equivalentPhi", float[].class);
diff --git a/test/460-multiple-returns3/src/Main.java b/test/460-multiple-returns3/src/Main.java
index fb8a115..1783eac 100644
--- a/test/460-multiple-returns3/src/Main.java
+++ b/test/460-multiple-returns3/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("MultipleReturns");
Method m = c.getMethod("caller");
diff --git a/test/467-regalloc-pair/src/Main.java b/test/467-regalloc-pair/src/Main.java
index aac07fd..297b1af 100644
--- a/test/467-regalloc-pair/src/Main.java
+++ b/test/467-regalloc-pair/src/Main.java
@@ -21,10 +21,6 @@
}
public class Main implements Itf {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("TestCase");
Method m = c.getMethod("testCase", byte[].class, Main.class);
diff --git a/test/471-uninitialized-locals/src/Main.java b/test/471-uninitialized-locals/src/Main.java
index 1ac749e..3feacac 100644
--- a/test/471-uninitialized-locals/src/Main.java
+++ b/test/471-uninitialized-locals/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String args[]) throws Exception {
try {
Class<?> c = Class.forName("Test");
diff --git a/test/472-unreachable-if-regression/src/Main.java b/test/472-unreachable-if-regression/src/Main.java
index d426df1..2adc77c 100644
--- a/test/472-unreachable-if-regression/src/Main.java
+++ b/test/472-unreachable-if-regression/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String args[]) throws Exception {
System.out.println("Test started.");
Class<?> c = Class.forName("Test");
diff --git a/test/475-regression-inliner-ids/src/Main.java b/test/475-regression-inliner-ids/src/Main.java
index 423c3b5..0ccc6a6 100644
--- a/test/475-regression-inliner-ids/src/Main.java
+++ b/test/475-regression-inliner-ids/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("TestCase");
Method m = c.getMethod("testCase", int.class);
diff --git a/test/485-checker-dce-loop-update/src/Main.java b/test/485-checker-dce-loop-update/src/Main.java
index 6bfe08b..d06030c 100644
--- a/test/485-checker-dce-loop-update/src/Main.java
+++ b/test/485-checker-dce-loop-update/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
return;
}
diff --git a/test/498-type-propagation/expected-stdout.txt b/test/498-type-propagation/expected-stdout.txt
index ccaf6f8..e69de29 100644
--- a/test/498-type-propagation/expected-stdout.txt
+++ b/test/498-type-propagation/expected-stdout.txt
@@ -1 +0,0 @@
-Enter
diff --git a/test/498-type-propagation/src/Main.java b/test/498-type-propagation/src/Main.java
index 7a14172..b20794c 100644
--- a/test/498-type-propagation/src/Main.java
+++ b/test/498-type-propagation/src/Main.java
@@ -18,8 +18,6 @@
public class Main {
public static void main(String[] args) throws Exception {
- // Workaround for b/18051191.
- System.out.println("Enter");
Class<?> c = Class.forName("TypePropagation");
Method m = c.getMethod("method", int[].class);
int[] array = new int[7];
diff --git a/test/501-null-constant-dce/expected-stdout.txt b/test/501-null-constant-dce/expected-stdout.txt
index ccaf6f8..e69de29 100644
--- a/test/501-null-constant-dce/expected-stdout.txt
+++ b/test/501-null-constant-dce/expected-stdout.txt
@@ -1 +0,0 @@
-Enter
diff --git a/test/501-null-constant-dce/src/Main.java b/test/501-null-constant-dce/src/Main.java
index 3a2d491..4e2709e 100644
--- a/test/501-null-constant-dce/src/Main.java
+++ b/test/501-null-constant-dce/src/Main.java
@@ -18,8 +18,6 @@
public class Main {
public static void main(String[] args) throws Exception {
- // Workaround for b/18051191.
- System.out.println("Enter");
Class<?> c = Class.forName("DCE");
Method m = c.getMethod("method", int[].class);
int[] array = new int[7];
diff --git a/test/501-regression-packed-switch/src/Main.java b/test/501-regression-packed-switch/src/Main.java
index 74c081a..7cd733a 100644
--- a/test/501-regression-packed-switch/src/Main.java
+++ b/test/501-regression-packed-switch/src/Main.java
@@ -18,10 +18,6 @@
import java.lang.reflect.Type;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String args[]) throws Exception {
Class<?> c = Class.forName("Test");
Method m = c.getMethod("EmptyPackedSwitch", int.class);
diff --git a/test/503-dead-instructions/expected-stdout.txt b/test/503-dead-instructions/expected-stdout.txt
index ccaf6f8..e69de29 100644
--- a/test/503-dead-instructions/expected-stdout.txt
+++ b/test/503-dead-instructions/expected-stdout.txt
@@ -1 +0,0 @@
-Enter
diff --git a/test/503-dead-instructions/src/Main.java b/test/503-dead-instructions/src/Main.java
index 6249dc7..74a6bee 100644
--- a/test/503-dead-instructions/src/Main.java
+++ b/test/503-dead-instructions/src/Main.java
@@ -18,8 +18,6 @@
public class Main {
public static void main(String[] args) throws Exception {
- // Workaround for b/18051191.
- System.out.println("Enter");
Class<?> c = Class.forName("DeadInstructions");
Method m = c.getMethod("method1");
Object[] arguments1 = { };
diff --git a/test/504-regression-baseline-entry/src/Main.java b/test/504-regression-baseline-entry/src/Main.java
index 284cbdc..038e7bb 100644
--- a/test/504-regression-baseline-entry/src/Main.java
+++ b/test/504-regression-baseline-entry/src/Main.java
@@ -18,10 +18,6 @@
import java.lang.reflect.Type;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String args[]) throws Exception {
Class<?> c = Class.forName("Test");
Method m = c.getMethod("SingleGotoStart");
diff --git a/test/506-verify-aput/expected-stdout.txt b/test/506-verify-aput/expected-stdout.txt
index ccaf6f8..e69de29 100644
--- a/test/506-verify-aput/expected-stdout.txt
+++ b/test/506-verify-aput/expected-stdout.txt
@@ -1 +0,0 @@
-Enter
diff --git a/test/506-verify-aput/src/Main.java b/test/506-verify-aput/src/Main.java
index 08368d4..a850312 100644
--- a/test/506-verify-aput/src/Main.java
+++ b/test/506-verify-aput/src/Main.java
@@ -18,8 +18,6 @@
public class Main {
public static void main(String[] args) throws Exception {
- // Workaround for b/18051191.
- System.out.println("Enter");
try {
Class.forName("VerifyAPut1");
throw new Error("expected verification error");
diff --git a/test/509-pre-header/expected-stdout.txt b/test/509-pre-header/expected-stdout.txt
index ccaf6f8..e69de29 100644
--- a/test/509-pre-header/expected-stdout.txt
+++ b/test/509-pre-header/expected-stdout.txt
@@ -1 +0,0 @@
-Enter
diff --git a/test/509-pre-header/src/Main.java b/test/509-pre-header/src/Main.java
index 1eca419..bc5e1ed 100644
--- a/test/509-pre-header/src/Main.java
+++ b/test/509-pre-header/src/Main.java
@@ -18,8 +18,6 @@
public class Main {
public static void main(String[] args) throws Exception {
- // Workaround for b/18051191.
- System.out.println("Enter");
Class<?> c = Class.forName("PreHeader");
Method m = c.getMethod("method");
Object[] arguments = { };
diff --git a/test/510-checker-try-catch/src/Main.java b/test/510-checker-try-catch/src/Main.java
index 18658cd..5d1d2d8 100644
--- a/test/510-checker-try-catch/src/Main.java
+++ b/test/510-checker-try-catch/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public enum TestPath {
ExceptionalFlow1(true, false, 3),
ExceptionalFlow2(false, true, 8),
diff --git a/test/511-clinit-interface/expected-stdout.txt b/test/511-clinit-interface/expected-stdout.txt
index ccaf6f8..e69de29 100644
--- a/test/511-clinit-interface/expected-stdout.txt
+++ b/test/511-clinit-interface/expected-stdout.txt
@@ -1 +0,0 @@
-Enter
diff --git a/test/511-clinit-interface/src/Main.java b/test/511-clinit-interface/src/Main.java
index c4d0c66..906aaae 100644
--- a/test/511-clinit-interface/src/Main.java
+++ b/test/511-clinit-interface/src/Main.java
@@ -18,8 +18,6 @@
public class Main {
public static void main(String[] args) throws Exception {
- // Workaround for b/18051191.
- System.out.println("Enter");
Class<?> c = Class.forName("BogusInterface");
}
diff --git a/test/515-dce-dominator/expected-stdout.txt b/test/515-dce-dominator/expected-stdout.txt
index ccaf6f8..e69de29 100644
--- a/test/515-dce-dominator/expected-stdout.txt
+++ b/test/515-dce-dominator/expected-stdout.txt
@@ -1 +0,0 @@
-Enter
diff --git a/test/515-dce-dominator/src/Main.java b/test/515-dce-dominator/src/Main.java
index bf9ee25..8c6ce75 100644
--- a/test/515-dce-dominator/src/Main.java
+++ b/test/515-dce-dominator/src/Main.java
@@ -18,8 +18,6 @@
public class Main {
public static void main(String[] args) throws Exception {
- // Workaround for b/18051191.
- System.out.println("Enter");
Class<?> c = Class.forName("Dominator");
Method m = c.getMethod("method", int.class);
Object[] arguments = { 5 };
diff --git a/test/516-dead-move-result/src/Main.java b/test/516-dead-move-result/src/Main.java
index 90580a8..8f0891a 100644
--- a/test/516-dead-move-result/src/Main.java
+++ b/test/516-dead-move-result/src/Main.java
@@ -17,9 +17,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("MoveResult");
Method m = c.getMethod("method");
diff --git a/test/518-null-array-get/src/Main.java b/test/518-null-array-get/src/Main.java
index 678aef1..7090194 100644
--- a/test/518-null-array-get/src/Main.java
+++ b/test/518-null-array-get/src/Main.java
@@ -18,9 +18,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
checkLoad("NullArrayFailInt2Object", true);
checkLoad("NullArrayFailObject2Int", true);
diff --git a/test/520-equivalent-phi/src/Main.java b/test/520-equivalent-phi/src/Main.java
index 96608bd..ba84983 100644
--- a/test/520-equivalent-phi/src/Main.java
+++ b/test/520-equivalent-phi/src/Main.java
@@ -17,9 +17,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class Inner {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("Equivalent");
Method m = c.getMethod("method", int[].class);
diff --git a/test/522-checker-regression-monitor-exit/src/Main.java b/test/522-checker-regression-monitor-exit/src/Main.java
index 5c26f36..41b609f 100644
--- a/test/522-checker-regression-monitor-exit/src/Main.java
+++ b/test/522-checker-regression-monitor-exit/src/Main.java
@@ -27,10 +27,6 @@
import java.util.concurrent.TimeoutException;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
private static class HashCodeQuery implements Callable<Integer> {
public HashCodeQuery(Object obj) {
m_obj = obj;
diff --git a/test/523-checker-can-throw-regression/src/Main.java b/test/523-checker-can-throw-regression/src/Main.java
index 3ff48f3..820b668 100644
--- a/test/523-checker-can-throw-regression/src/Main.java
+++ b/test/523-checker-can-throw-regression/src/Main.java
@@ -27,9 +27,5 @@
import java.util.concurrent.TimeoutException;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String args[]) {}
}
diff --git a/test/530-checker-lse3/src/Main.java b/test/530-checker-lse3/src/Main.java
index 0509e47..461b6ab 100644
--- a/test/530-checker-lse3/src/Main.java
+++ b/test/530-checker-lse3/src/Main.java
@@ -18,10 +18,6 @@
import java.lang.reflect.Field;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("StoreLoad");
Method m = c.getMethod("test", int.class);
diff --git a/test/531-regression-debugphi/src/Main.java b/test/531-regression-debugphi/src/Main.java
index 858770f..c77ea25 100644
--- a/test/531-regression-debugphi/src/Main.java
+++ b/test/531-regression-debugphi/src/Main.java
@@ -15,8 +15,5 @@
*/
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) {}
}
diff --git a/test/533-regression-debugphi/src/Main.java b/test/533-regression-debugphi/src/Main.java
index 858770f..c77ea25 100644
--- a/test/533-regression-debugphi/src/Main.java
+++ b/test/533-regression-debugphi/src/Main.java
@@ -15,8 +15,5 @@
*/
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) {}
}
diff --git a/test/535-regression-const-val/src/Main.java b/test/535-regression-const-val/src/Main.java
index 858770f..c77ea25 100644
--- a/test/535-regression-const-val/src/Main.java
+++ b/test/535-regression-const-val/src/Main.java
@@ -15,8 +15,5 @@
*/
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) {}
}
diff --git a/test/537-checker-debuggable/src/Main.java b/test/537-checker-debuggable/src/Main.java
index a572648..c6db48a 100644
--- a/test/537-checker-debuggable/src/Main.java
+++ b/test/537-checker-debuggable/src/Main.java
@@ -15,9 +15,5 @@
*/
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) { }
}
diff --git a/test/541-regression-inlined-deopt/src/Main.java b/test/541-regression-inlined-deopt/src/Main.java
index fa79590..f67ea2c 100644
--- a/test/541-regression-inlined-deopt/src/Main.java
+++ b/test/541-regression-inlined-deopt/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.*;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Throwable {
try {
Class<?> c = Class.forName("TestCase");
diff --git a/test/543-checker-dce-trycatch/src/Main.java b/test/543-checker-dce-trycatch/src/Main.java
index 0d7596a..269e4ca 100644
--- a/test/543-checker-dce-trycatch/src/Main.java
+++ b/test/543-checker-dce-trycatch/src/Main.java
@@ -15,10 +15,6 @@
*/
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
static boolean $inline$False() { return false; }
// DCE should only merge blocks where the first ends with a Goto.
diff --git a/test/543-env-long-ref/src/Main.java b/test/543-env-long-ref/src/Main.java
index e723789..a0d4a49 100644
--- a/test/543-env-long-ref/src/Main.java
+++ b/test/543-env-long-ref/src/Main.java
@@ -17,9 +17,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Throwable {
System.loadLibrary(args[0]);
Class<?> c = Class.forName("TestCase");
diff --git a/test/546-regression-simplify-catch/src/Main.java b/test/546-regression-simplify-catch/src/Main.java
index 8eddac3..1f6a82e 100644
--- a/test/546-regression-simplify-catch/src/Main.java
+++ b/test/546-regression-simplify-catch/src/Main.java
@@ -15,10 +15,6 @@
*/
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) {}
}
diff --git a/test/547-regression-trycatch-critic-edge/src/Main.java b/test/547-regression-trycatch-critic-edge/src/Main.java
index 8eddac3..1f6a82e 100644
--- a/test/547-regression-trycatch-critic-edge/src/Main.java
+++ b/test/547-regression-trycatch-critic-edge/src/Main.java
@@ -15,10 +15,6 @@
*/
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) {}
}
diff --git a/test/550-checker-regression-wide-store/src/Main.java b/test/550-checker-regression-wide-store/src/Main.java
index 9b502df..fe61309 100644
--- a/test/550-checker-regression-wide-store/src/Main.java
+++ b/test/550-checker-regression-wide-store/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
private static int runTestCase(String name, long arg) throws Exception {
Class<?> c = Class.forName("TestCase");
Method m = c.getMethod(name, long.class);
diff --git a/test/551-invoke-super/src/Main.java b/test/551-invoke-super/src/Main.java
index 3a30184..798a982 100644
--- a/test/551-invoke-super/src/Main.java
+++ b/test/551-invoke-super/src/Main.java
@@ -18,9 +18,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("InvokeSuper");
try {
diff --git a/test/552-checker-primitive-typeprop/src/Main.java b/test/552-checker-primitive-typeprop/src/Main.java
index 1296800..4e717b1 100644
--- a/test/552-checker-primitive-typeprop/src/Main.java
+++ b/test/552-checker-primitive-typeprop/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
private static void assertEquals(int expected, int actual) {
if (expected != actual) {
throw new Error("Wrong result, expected=" + expected + ", actual=" + actual);
diff --git a/test/552-invoke-non-existent-super/src/Main.java b/test/552-invoke-non-existent-super/src/Main.java
index c264471..0bb0d47 100644
--- a/test/552-invoke-non-existent-super/src/Main.java
+++ b/test/552-invoke-non-existent-super/src/Main.java
@@ -18,9 +18,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("InvokeSuper");
try {
diff --git a/test/556-invoke-super/src/Main.java b/test/556-invoke-super/src/Main.java
index 07289f7..91d2394 100644
--- a/test/556-invoke-super/src/Main.java
+++ b/test/556-invoke-super/src/Main.java
@@ -17,10 +17,6 @@
import java.lang.reflect.Method;
public class Main {
-
- // Workaround for b/18051191.
- class InnerClass {}
-
static void assertEquals(int expected, int value) {
if (expected != value) {
throw new Error("Expected " + expected + ", got " + value);
diff --git a/test/559-checker-irreducible-loop/src/Main.java b/test/559-checker-irreducible-loop/src/Main.java
index 023e769..97165ec 100644
--- a/test/559-checker-irreducible-loop/src/Main.java
+++ b/test/559-checker-irreducible-loop/src/Main.java
@@ -17,9 +17,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("IrreducibleLoop");
{
diff --git a/test/563-checker-fakestring/src/Main.java b/test/563-checker-fakestring/src/Main.java
index 1ca80f0..7e775b3 100644
--- a/test/563-checker-fakestring/src/Main.java
+++ b/test/563-checker-fakestring/src/Main.java
@@ -18,9 +18,6 @@
import java.lang.reflect.InvocationTargetException;
public class Main {
- // Workaround for b/18051191.
- class Inner {}
-
public static native void assertIsInterpreted();
public static native void ensureJitCompiled(Class<?> cls, String methodName);
diff --git a/test/564-checker-irreducible-loop/src/Main.java b/test/564-checker-irreducible-loop/src/Main.java
index 94e3357..0de88d4 100644
--- a/test/564-checker-irreducible-loop/src/Main.java
+++ b/test/564-checker-irreducible-loop/src/Main.java
@@ -17,9 +17,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("IrreducibleLoop");
Method m = c.getMethod("simpleLoop", int.class);
diff --git a/test/565-checker-irreducible-loop/src/Main.java b/test/565-checker-irreducible-loop/src/Main.java
index e48bd6b..b85460c 100644
--- a/test/565-checker-irreducible-loop/src/Main.java
+++ b/test/565-checker-irreducible-loop/src/Main.java
@@ -17,9 +17,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("IrreducibleLoop");
{
diff --git a/test/571-irreducible-loop/src/Main.java b/test/571-irreducible-loop/src/Main.java
index ff22f67..53689ba 100644
--- a/test/571-irreducible-loop/src/Main.java
+++ b/test/571-irreducible-loop/src/Main.java
@@ -17,9 +17,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("IrreducibleLoop");
Method m = c.getMethod("test1", int.class, float.class);
diff --git a/test/574-irreducible-and-constant-area/src/Main.java b/test/574-irreducible-and-constant-area/src/Main.java
index 3cdd924..44a3ba3 100644
--- a/test/574-irreducible-and-constant-area/src/Main.java
+++ b/test/574-irreducible-and-constant-area/src/Main.java
@@ -17,9 +17,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("IrreducibleLoop");
Method m = c.getMethod("simpleLoop", int.class);
diff --git a/test/575-checker-string-init-alias/src/Main.java b/test/575-checker-string-init-alias/src/Main.java
index b55b0c5..be7b108 100644
--- a/test/575-checker-string-init-alias/src/Main.java
+++ b/test/575-checker-string-init-alias/src/Main.java
@@ -19,9 +19,6 @@
import java.lang.reflect.InvocationTargetException;
public class Main {
- // Workaround for b/18051191.
- class Inner {}
-
public static native void assertIsInterpreted();
public static native void ensureJitCompiled(Class<?> cls, String methodName);
diff --git a/test/588-checker-irreducib-lifetime-hole/src/Main.java b/test/588-checker-irreducib-lifetime-hole/src/Main.java
index 98565b1..421c460 100644
--- a/test/588-checker-irreducib-lifetime-hole/src/Main.java
+++ b/test/588-checker-irreducib-lifetime-hole/src/Main.java
@@ -17,9 +17,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("IrreducibleLoop");
{
diff --git a/test/592-checker-regression-bool-input/src/Main.java b/test/592-checker-regression-bool-input/src/Main.java
index 35ae59c..0955be6 100644
--- a/test/592-checker-regression-bool-input/src/Main.java
+++ b/test/592-checker-regression-bool-input/src/Main.java
@@ -19,9 +19,6 @@
import java.lang.reflect.InvocationTargetException;
public class Main {
- // Workaround for b/18051191.
- class Inner {}
-
public static boolean field0;
public static boolean field1;
public static boolean field2;
diff --git a/test/594-checker-irreducible-linorder/src/Main.java b/test/594-checker-irreducible-linorder/src/Main.java
index 38b2ab4..4b1f490 100644
--- a/test/594-checker-irreducible-linorder/src/Main.java
+++ b/test/594-checker-irreducible-linorder/src/Main.java
@@ -15,9 +15,6 @@
*/
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) {
// Nothing to run. This regression test merely makes sure the smali test
// case successfully compiles.
diff --git a/test/596-checker-dead-phi/src/Main.java b/test/596-checker-dead-phi/src/Main.java
index 1a69078..f3a55df 100644
--- a/test/596-checker-dead-phi/src/Main.java
+++ b/test/596-checker-dead-phi/src/Main.java
@@ -17,9 +17,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("IrreducibleLoop");
// Note that we don't actually enter the loops in the 'liveness'
diff --git a/test/598-checker-irreducible-dominance/src/Main.java b/test/598-checker-irreducible-dominance/src/Main.java
index 38b2ab4..4b1f490 100644
--- a/test/598-checker-irreducible-dominance/src/Main.java
+++ b/test/598-checker-irreducible-dominance/src/Main.java
@@ -15,9 +15,6 @@
*/
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) {
// Nothing to run. This regression test merely makes sure the smali test
// case successfully compiles.
diff --git a/test/599-checker-irreducible-loop/src/Main.java b/test/599-checker-irreducible-loop/src/Main.java
index aefbc65..643e3a1 100644
--- a/test/599-checker-irreducible-loop/src/Main.java
+++ b/test/599-checker-irreducible-loop/src/Main.java
@@ -17,9 +17,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("IrreducibleLoop");
Method m = c.getMethod("test", int.class);
diff --git a/test/641-irreducible-inline/src/Main.java b/test/641-irreducible-inline/src/Main.java
index 53244f7..fab6511 100644
--- a/test/641-irreducible-inline/src/Main.java
+++ b/test/641-irreducible-inline/src/Main.java
@@ -17,9 +17,6 @@
import java.lang.reflect.Method;
public class Main {
- // Workaround for b/18051191.
- class InnerClass {}
-
public static void main(String[] args) throws Exception {
Class<?> c = Class.forName("IrreducibleLoop");
Method m = c.getMethod("simpleLoop", int.class);