Remove workarounds for fixed bug 18051191

Bug: 18051191
Test: ART run-tests
Change-Id: Iae9b1ed30f26dbe8efb291d71d7224e64eea14df

67 files changed, 0 insertions, 199 deletions

diff --git a/test/425-invoke-super/expected-stdout.txt b/test/425-invoke-super/expected-stdout.txt
index f7f6ae4911..e69de29bb2 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 f3166fd35b..1fb62d0871 100644
--- a/test/425-invoke-super/src/Main.java
+++ b/test/425-invoke-super/src/Main.java
@@ -39,8 +39,6 @@ public class Main {
   }
 
   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 ccaf6f8f0f..e69de29bb2 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 91dfe10845..2aaba8eb9e 100644
--- a/test/431-type-propagation/src/Main.java
+++ b/test/431-type-propagation/src/Main.java
@@ -18,7 +18,6 @@ import java.lang.reflect.Method;
 
 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 45157abf1a..1bdf7b5cc8 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 4050ed1bc9..88be3856ed 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 8904c45a33..54035a0fef 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 f0557434e2..3f31645974 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 428c91301f..2f12ea2496 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 0ecc0bdcc4..b7ef18e511 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 fb8a1151d1..1783eacf25 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 aac07fdc22..297b1af83c 100644
--- a/test/467-regalloc-pair/src/Main.java
+++ b/test/467-regalloc-pair/src/Main.java
@@ -21,10 +21,6 @@ interface Itf {
 }
 
 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 1ac749e142..3feacacd33 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 d426df1d0f..2adc77c853 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 423c3b5c92..0ccc6a6348 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 6bfe08b0d3..d06030c6c8 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 ccaf6f8f0f..e69de29bb2 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 7a14172bf5..b20794c31c 100644
--- a/test/498-type-propagation/src/Main.java
+++ b/test/498-type-propagation/src/Main.java
@@ -18,8 +18,6 @@ import java.lang.reflect.Method;
 
 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 ccaf6f8f0f..e69de29bb2 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 3a2d491b15..4e2709efd5 100644
--- a/test/501-null-constant-dce/src/Main.java
+++ b/test/501-null-constant-dce/src/Main.java
@@ -18,8 +18,6 @@ import java.lang.reflect.Method;
 
 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 74c081a2be..7cd733ab04 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.Method;
 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 ccaf6f8f0f..e69de29bb2 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 6249dc79fa..74a6beeafd 100644
--- a/test/503-dead-instructions/src/Main.java
+++ b/test/503-dead-instructions/src/Main.java
@@ -18,8 +18,6 @@ import java.lang.reflect.Method;
 
 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 284cbdcc19..038e7bb31f 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.Method;
 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 ccaf6f8f0f..e69de29bb2 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 08368d4fa3..a850312316 100644
--- a/test/506-verify-aput/src/Main.java
+++ b/test/506-verify-aput/src/Main.java
@@ -18,8 +18,6 @@ import java.lang.reflect.Method;
 
 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 ccaf6f8f0f..e69de29bb2 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 1eca41978c..bc5e1ed83c 100644
--- a/test/509-pre-header/src/Main.java
+++ b/test/509-pre-header/src/Main.java
@@ -18,8 +18,6 @@ import java.lang.reflect.Method;
 
 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 18658cd5e0..5d1d2d8f85 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 ccaf6f8f0f..e69de29bb2 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 c4d0c6625e..906aaae997 100644
--- a/test/511-clinit-interface/src/Main.java
+++ b/test/511-clinit-interface/src/Main.java
@@ -18,8 +18,6 @@ import java.lang.reflect.Method;
 
 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 ccaf6f8f0f..e69de29bb2 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 bf9ee2560a..8c6ce753bf 100644
--- a/test/515-dce-dominator/src/Main.java
+++ b/test/515-dce-dominator/src/Main.java
@@ -18,8 +18,6 @@ import java.lang.reflect.Method;
 
 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 90580a846e..8f0891adae 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 678aef1f43..7090194d32 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.InvocationTargetException;
 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 96608bdca6..ba8498327d 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 5c26f36fe8..41b609fb96 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.CancellationException;
 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 3ff48f3d4d..820b668e18 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.CancellationException;
 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 0509e47ca0..461b6ab1e9 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.Method;
 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 858770f508..c77ea25947 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 858770f508..c77ea25947 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 858770f508..c77ea25947 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 a572648109..c6db48a4b0 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 fa79590e65..f67ea2ce1d 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 0d7596a2a1..269e4ca5cb 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 e723789ce2..a0d4a49f4b 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 8eddac3fea..1f6a82e28f 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 8eddac3fea..1f6a82e28f 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 9b502df632..fe613094ba 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 3a301847d3..798a982a1b 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.InvocationTargetException;
 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 129680018f..4e717b13e8 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 c2644711a1..0bb0d471ce 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.InvocationTargetException;
 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 07289f7572..91d23943cb 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 023e7695fe..97165eca6e 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 1ca80f08e7..7e775b3662 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.Method;
 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 94e3357e5d..0de88d4b27 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 e48bd6b411..b85460cc58 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 ff22f6720f..53689ba689 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 3cdd92456c..44a3ba3b48 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 b55b0c5ad8..be7b1082b0 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.Method;
 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 98565b103a..421c460d44 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 35ae59ca3e..0955be6439 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.Method;
 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 38b2ab4384..4b1f490bcf 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 1a69078dca..f3a55df46a 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 38b2ab4384..4b1f490bcf 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 aefbc65af2..643e3a1893 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 53244f7c30..fab6511d0c 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);