8151880: EnqueueMethodForCompilationTest.java still fails to compile method
authorneliasso
Wed, 06 Apr 2016 14:48:45 +0200
changeset 38025 5ed9ce1e4a2f
parent 38023 5fcccfdea459
child 38026 c0cbc69330c1
8151880: EnqueueMethodForCompilationTest.java still fails to compile method Summary: Extract SimpleTestCaseHelper inner class Reviewed-by: kvn
hotspot/test/compiler/whitebox/ClearMethodStateTest.java
hotspot/test/compiler/whitebox/CompilerWhiteBoxTest.java
hotspot/test/compiler/whitebox/DeoptimizeAllTest.java
hotspot/test/compiler/whitebox/DeoptimizeFramesTest.java
hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java
hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java
hotspot/test/compiler/whitebox/ForceNMethodSweepTest.java
hotspot/test/compiler/whitebox/GetNMethodTest.java
hotspot/test/compiler/whitebox/IsMethodCompilableTest.java
hotspot/test/compiler/whitebox/LockCompilationTest.java
hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java
hotspot/test/compiler/whitebox/SimpleTestCase.java
--- a/hotspot/test/compiler/whitebox/ClearMethodStateTest.java	Thu Apr 07 12:16:03 2016 +0000
+++ b/hotspot/test/compiler/whitebox/ClearMethodStateTest.java	Wed Apr 06 14:48:45 2016 +0200
@@ -31,9 +31,9 @@
  * @library /testlibrary /test/lib /
  * @modules java.management
  * @build ClearMethodStateTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ClearMethodStateTest
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+PrintCompilation -XX:-UseCounterDecay ClearMethodStateTest
  * @summary testing of WB::clearMethodState()
  * @author igor.ignatyev@oracle.com
  */
@@ -41,8 +41,8 @@
 
     public static void main(String[] args) throws Exception {
         String directive =
-                "[{ match:\"*SimpleTestCase$Helper.*\", BackgroundCompilation: false }, " +
-                " { match:\"*.*\", inline:\"-*SimpleTestCase$Helper.*\"}]";
+                "[{ match:\"*SimpleTestCaseHelper.*\", BackgroundCompilation: false }, " +
+                " { match:\"*.*\", inline:\"-*SimpleTestCaseHelper.*\"}]";
         if (WHITE_BOX.addCompilerDirective(directive) != 2) {
             throw new RuntimeException("Could not add directive");
         }
--- a/hotspot/test/compiler/whitebox/CompilerWhiteBoxTest.java	Thu Apr 07 12:16:03 2016 +0000
+++ b/hotspot/test/compiler/whitebox/CompilerWhiteBoxTest.java	Wed Apr 06 14:48:45 2016 +0200
@@ -24,6 +24,7 @@
 
 import sun.hotspot.WhiteBox;
 import sun.hotspot.code.NMethod;
+
 import java.lang.reflect.Executable;
 import java.util.Objects;
 import java.util.concurrent.Callable;
@@ -58,6 +59,8 @@
     /** Value of {@code -XX:BackgroundCompilation} */
     protected static final boolean BACKGROUND_COMPILATION
             = Boolean.valueOf(getVMOption("BackgroundCompilation", "true"));
+    protected static final boolean USE_COUNTER_DECAY
+            = Boolean.valueOf(getVMOption("UseCounterDecay", "true"));
     /** Value of {@code -XX:TieredCompilation} */
     protected static final boolean TIERED_COMPILATION
             = Boolean.valueOf(getVMOption("TieredCompilation", "false"));
@@ -370,7 +373,10 @@
      * @return accumulated result
      * @see #compile(int)
      */
-    protected final int compile() {
+    protected final int compile() throws Exception {
+        if (USE_COUNTER_DECAY) {
+            throw new Exception("Tests using compile method must turn off counter decay for reliability");
+        }
         if (testCase.isOsr()) {
             return compile(1);
         } else {
--- a/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java	Thu Apr 07 12:16:03 2016 +0000
+++ b/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java	Wed Apr 06 14:48:45 2016 +0200
@@ -29,9 +29,9 @@
  * @library /testlibrary /test/lib /
  * @modules java.management
  * @build DeoptimizeAllTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCase$Helper::* DeoptimizeAllTest
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-UseCounterDecay -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::* DeoptimizeAllTest
  * @summary testing of WB::deoptimizeAll()
  * @author igor.ignatyev@oracle.com
  */
--- a/hotspot/test/compiler/whitebox/DeoptimizeFramesTest.java	Thu Apr 07 12:16:03 2016 +0000
+++ b/hotspot/test/compiler/whitebox/DeoptimizeFramesTest.java	Wed Apr 06 14:48:45 2016 +0200
@@ -29,15 +29,15 @@
  * @library /testlibrary /test/lib /
  * @modules java.management
  * @build DeoptimizeFramesTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
- *                   -XX:+WhiteBoxAPI -Xmixed
+ *                   -XX:+WhiteBoxAPI -Xmixed -XX:-UseCounterDecay
  *                   -XX:CompileCommand=compileonly,DeoptimizeFramesTest$TestCaseImpl::method
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:-DeoptimizeRandom -XX:-DeoptimizeALot
  *                   DeoptimizeFramesTest true
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
- *                   -XX:+WhiteBoxAPI -Xmixed
+ *                   -XX:+WhiteBoxAPI -Xmixed -XX:-UseCounterDecay
  *                   -XX:CompileCommand=compileonly,DeoptimizeFramesTest$TestCaseImpl::method
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:-DeoptimizeRandom -XX:-DeoptimizeALot
  *                   DeoptimizeFramesTest false
--- a/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java	Thu Apr 07 12:16:03 2016 +0000
+++ b/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java	Wed Apr 06 14:48:45 2016 +0200
@@ -29,9 +29,9 @@
  * @library /testlibrary /test/lib /
  * @modules java.management
  * @build DeoptimizeMethodTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCase$Helper::* DeoptimizeMethodTest
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-UseCounterDecay -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::* DeoptimizeMethodTest
  * @summary testing of WB::deoptimizeMethod()
  * @author igor.ignatyev@oracle.com
  */
--- a/hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java	Thu Apr 07 12:16:03 2016 +0000
+++ b/hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java	Wed Apr 06 14:48:45 2016 +0200
@@ -29,9 +29,9 @@
  * @library /testlibrary /test/lib /
  * @modules java.management
  * @build EnqueueMethodForCompilationTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI EnqueueMethodForCompilationTest
+ * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+PrintCompilation -XX:-UseCounterDecay EnqueueMethodForCompilationTest
  * @summary testing of WB::enqueueMethodForCompilation()
  * @author igor.ignatyev@oracle.com
  */
@@ -39,8 +39,8 @@
 
     public static void main(String[] args) throws Exception {
         String directive =
-                "[{ match:\"*SimpleTestCase$Helper.*\", BackgroundCompilation: false }, " +
-                " { match:\"*.*\", inline:\"-*SimpleTestCase$Helper.*\"}]";
+                "[{ match:\"*SimpleTestCaseHelper.*\", BackgroundCompilation: false }, " +
+                " { match:\"*.*\", inline:\"-*SimpleTestCaseHelper.*\"}]";
         if (WHITE_BOX.addCompilerDirective(directive) != 2) {
             throw new RuntimeException("Could not add directive");
         }
@@ -86,7 +86,10 @@
         checkNotCompiled();
         WHITE_BOX.clearMethodState(method);
 
-        WHITE_BOX.enqueueMethodForCompilation(method, compLevel, bci);
+        if (!WHITE_BOX.enqueueMethodForCompilation(method, compLevel, bci)) {
+           throw new RuntimeException(method
+                    + " could not be enqueued for compilation");
+        }
         checkCompiled();
         deoptimize();
         checkNotCompiled();
--- a/hotspot/test/compiler/whitebox/ForceNMethodSweepTest.java	Thu Apr 07 12:16:03 2016 +0000
+++ b/hotspot/test/compiler/whitebox/ForceNMethodSweepTest.java	Wed Apr 06 14:48:45 2016 +0200
@@ -38,12 +38,12 @@
  * @library /testlibrary /test/lib /
  * @modules java.management
  * @build ForceNMethodSweepTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:-TieredCompilation -XX:+WhiteBoxAPI
- *                   -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCase$Helper::*
- *                   -XX:-BackgroundCompilation ForceNMethodSweepTest
+ *                   -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::*
+ *                   -XX:-BackgroundCompilation -XX:-UseCounterDecay ForceNMethodSweepTest
  * @summary testing of WB::forceNMethodSweep
  */
 public class ForceNMethodSweepTest extends CompilerWhiteBoxTest {
--- a/hotspot/test/compiler/whitebox/GetNMethodTest.java	Thu Apr 07 12:16:03 2016 +0000
+++ b/hotspot/test/compiler/whitebox/GetNMethodTest.java	Wed Apr 06 14:48:45 2016 +0200
@@ -33,9 +33,9 @@
  * @library /testlibrary /test/lib /
  * @modules java.management
  * @build GetNMethodTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCase$Helper::* GetNMethodTest
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-UseCounterDecay -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::* GetNMethodTest
  * @summary testing of WB::getNMethod()
  * @author igor.ignatyev@oracle.com
  */
--- a/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java	Thu Apr 07 12:16:03 2016 +0000
+++ b/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java	Wed Apr 06 14:48:45 2016 +0200
@@ -27,12 +27,13 @@
  * @library /testlibrary /test/lib /
  * @modules java.base/sun.misc
  *          java.management
- * @build jdk.test.lib.* sun.hotspot.WhiteBox
+ * @build jdk.test.lib.*
+ *        sun.hotspot.WhiteBox
  * @build IsMethodCompilableTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main ClassFileInstaller jdk.test.lib.Platform
- * @run main/othervm/timeout=2400 -Xbootclasspath/a:. -Xmixed -XX:-TieredCompilation -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:PerMethodRecompilationCutoff=3 -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCase$Helper::* IsMethodCompilableTest
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                jdk.test.lib.Platform
+ * @run main/othervm/timeout=2400 -Xbootclasspath/a:. -Xmixed -XX:-TieredCompilation -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:PerMethodRecompilationCutoff=3 -XX:-UseCounterDecay -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::* IsMethodCompilableTest
  * @summary testing of WB::isMethodCompilable()
  * @author igor.ignatyev@oracle.com
  */
--- a/hotspot/test/compiler/whitebox/LockCompilationTest.java	Thu Apr 07 12:16:03 2016 +0000
+++ b/hotspot/test/compiler/whitebox/LockCompilationTest.java	Wed Apr 06 14:48:45 2016 +0200
@@ -29,7 +29,7 @@
  * @build LockCompilationTest
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI LockCompilationTest
+ * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-UseCounterDecay LockCompilationTest
  * @summary testing of WB::lock/unlockCompilation()
  */
 
@@ -50,7 +50,7 @@
         // Only compile SimpleTestCase$Helper.method and exclude all other to ensure no
         // contention on the compile queue causes problems.
         String directive =
-                "[{ match:\"*SimpleTestCase$Helper.method\", Exclude:false}, " +
+                "[{ match:\"*SimpleTestCaseHelper.method\", Exclude:false}, " +
                 " { match:\"*.*\", Exclude:true}]";
         if (WHITE_BOX.addCompilerDirective(directive) != 2) {
             throw new RuntimeException("Could not add directive");
--- a/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java	Thu Apr 07 12:16:03 2016 +0000
+++ b/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java	Wed Apr 06 14:48:45 2016 +0200
@@ -29,9 +29,9 @@
  * @library /testlibrary /test/lib /
  * @modules java.management
  * @build MakeMethodNotCompilableTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI  -Xmixed MakeMethodNotCompilableTest
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmixed -XX:-UseCounterDecay MakeMethodNotCompilableTest
  * @summary testing of WB::makeMethodNotCompilable()
  * @author igor.ignatyev@oracle.com
  */
@@ -39,8 +39,8 @@
     private int bci;
     public static void main(String[] args) throws Exception {
         String directive =
-                "[{ match:\"*SimpleTestCase$Helper.*\", BackgroundCompilation: false }, " +
-                " { match:\"*.*\", inline:\"-*SimpleTestCase$Helper.*\"}]";
+                "[{ match:\"*SimpleTestCaseHelper.*\", BackgroundCompilation: false }, " +
+                " { match:\"*.*\", inline:\"-*SimpleTestCaseHelper.*\"}]";
         if (WHITE_BOX.addCompilerDirective(directive) != 2) {
             throw new RuntimeException("Could not add directive");
         }
@@ -227,7 +227,7 @@
         return false;
     }
 
-    private int getBci() {
+    private int getBci() throws Exception {
         compile();
         checkCompiled();
         int result = WHITE_BOX.getMethodEntryBci(method);
--- a/hotspot/test/compiler/whitebox/SimpleTestCase.java	Thu Apr 07 12:16:03 2016 +0000
+++ b/hotspot/test/compiler/whitebox/SimpleTestCase.java	Wed Apr 06 14:48:45 2016 +0200
@@ -31,18 +31,17 @@
 
 public enum SimpleTestCase implements CompilerWhiteBoxTest.TestCase {
     /** constructor test case */
-    CONSTRUCTOR_TEST(Helper.CONSTRUCTOR, Helper.CONSTRUCTOR_CALLABLE, false),
+    CONSTRUCTOR_TEST(SimpleTestCaseHelper.CONSTRUCTOR, SimpleTestCaseHelper.CONSTRUCTOR_CALLABLE, false),
     /** method test case */
-    METHOD_TEST(Helper.METHOD, Helper.METHOD_CALLABLE, false),
+    METHOD_TEST(SimpleTestCaseHelper.METHOD, SimpleTestCaseHelper.METHOD_CALLABLE, false),
     /** static method test case */
-    STATIC_TEST(Helper.STATIC, Helper.STATIC_CALLABLE, false),
+    STATIC_TEST(SimpleTestCaseHelper.STATIC, SimpleTestCaseHelper.STATIC_CALLABLE, false),
     /** OSR constructor test case */
-    OSR_CONSTRUCTOR_TEST(Helper.OSR_CONSTRUCTOR,
-            Helper.OSR_CONSTRUCTOR_CALLABLE, true),
+    OSR_CONSTRUCTOR_TEST(SimpleTestCaseHelper.OSR_CONSTRUCTOR, SimpleTestCaseHelper.OSR_CONSTRUCTOR_CALLABLE, true),
     /** OSR method test case */
-    OSR_METHOD_TEST(Helper.OSR_METHOD, Helper.OSR_METHOD_CALLABLE, true),
+    OSR_METHOD_TEST(SimpleTestCaseHelper.OSR_METHOD, SimpleTestCaseHelper.OSR_METHOD_CALLABLE, true),
     /** OSR static method test case */
-    OSR_STATIC_TEST(Helper.OSR_STATIC, Helper.OSR_STATIC_CALLABLE, true);
+    OSR_STATIC_TEST(SimpleTestCaseHelper.OSR_STATIC, SimpleTestCaseHelper.OSR_STATIC_CALLABLE, true);
 
     private final Executable executable;
     private final Callable<Integer> callable;
@@ -69,20 +68,21 @@
     public boolean isOsr() {
         return isOsr;
     }
+}
 
-    private static class Helper {
+    class SimpleTestCaseHelper {
 
-        private static final Callable<Integer> CONSTRUCTOR_CALLABLE
+        public static final Callable<Integer> CONSTRUCTOR_CALLABLE
                 = new Callable<Integer>() {
             @Override
             public Integer call() throws Exception {
-                return new Helper(1337).hashCode();
+                return new SimpleTestCaseHelper(1337).hashCode();
             }
         };
 
-        private static final Callable<Integer> METHOD_CALLABLE
+        public static final Callable<Integer> METHOD_CALLABLE
                 = new Callable<Integer>() {
-            private final Helper helper = new Helper();
+            private final SimpleTestCaseHelper helper = new SimpleTestCaseHelper();
 
             @Override
             public Integer call() throws Exception {
@@ -90,7 +90,7 @@
             }
         };
 
-        private static final Callable<Integer> STATIC_CALLABLE
+        public static final Callable<Integer> STATIC_CALLABLE
                 = new Callable<Integer>() {
             @Override
             public Integer call() throws Exception {
@@ -98,17 +98,17 @@
             }
         };
 
-        private static final Callable<Integer> OSR_CONSTRUCTOR_CALLABLE
+        public static final Callable<Integer> OSR_CONSTRUCTOR_CALLABLE
                 = new Callable<Integer>() {
             @Override
             public Integer call() throws Exception {
-                return new Helper(null, CompilerWhiteBoxTest.BACKEDGE_THRESHOLD).hashCode();
+                return new SimpleTestCaseHelper(null, CompilerWhiteBoxTest.BACKEDGE_THRESHOLD).hashCode();
             }
         };
 
-        private static final Callable<Integer> OSR_METHOD_CALLABLE
+        public static final Callable<Integer> OSR_METHOD_CALLABLE
                 = new Callable<Integer>() {
-            private final Helper helper = new Helper();
+            private final SimpleTestCaseHelper helper = new SimpleTestCaseHelper();
 
             @Override
             public Integer call() throws Exception {
@@ -116,7 +116,7 @@
             }
         };
 
-        private static final Callable<Integer> OSR_STATIC_CALLABLE
+        public static final Callable<Integer> OSR_STATIC_CALLABLE
                 = new Callable<Integer>() {
             @Override
             public Integer call() throws Exception {
@@ -124,22 +124,22 @@
             }
         };
 
-        private static final Constructor CONSTRUCTOR;
-        private static final Constructor OSR_CONSTRUCTOR;
-        private static final Method METHOD;
-        private static final Method STATIC;
-        private static final Method OSR_METHOD;
-        private static final Method OSR_STATIC;
+        public static final Constructor CONSTRUCTOR;
+        public static final Constructor OSR_CONSTRUCTOR;
+        public static final Method METHOD;
+        public static final Method STATIC;
+        public static final Method OSR_METHOD;
+        public static final Method OSR_STATIC;
 
         static {
             try {
-                CONSTRUCTOR = Helper.class.getDeclaredConstructor(int.class);
+                CONSTRUCTOR = SimpleTestCaseHelper.class.getDeclaredConstructor(int.class);
             } catch (NoSuchMethodException | SecurityException e) {
                 throw new RuntimeException(
                         "exception on getting method Helper.<init>(int)", e);
             }
             try {
-                OSR_CONSTRUCTOR = Helper.class.getDeclaredConstructor(
+                OSR_CONSTRUCTOR = SimpleTestCaseHelper.class.getDeclaredConstructor(
                         Object.class, long.class);
             } catch (NoSuchMethodException | SecurityException e) {
                 throw new RuntimeException(
@@ -153,7 +153,7 @@
 
         private static Method getMethod(String name, Class<?>... parameterTypes) {
             try {
-                return Helper.class.getDeclaredMethod(name, parameterTypes);
+                return SimpleTestCaseHelper.class.getDeclaredMethod(name, parameterTypes);
             } catch (NoSuchMethodException | SecurityException e) {
                 throw new RuntimeException(
                         "exception on getting method Helper." + name, e);
@@ -195,7 +195,7 @@
          */
         private static int warmup(Method m) throws Exception {
             waitAndDeoptimize(m);
-            Helper helper = new Helper();
+            SimpleTestCaseHelper helper = new SimpleTestCaseHelper();
             int result = 0;
             for (long i = 0; i < CompilerWhiteBoxTest.THRESHOLD; ++i) {
                 result += (int)m.invoke(helper, 1);
@@ -254,12 +254,12 @@
         private final int x;
 
         // for method and OSR method test case
-        public Helper() {
+        public SimpleTestCaseHelper() {
             x = 0;
         }
 
         // for OSR constructor test case
-        private Helper(Object o, long limit) throws Exception {
+        private SimpleTestCaseHelper(Object o, long limit) throws Exception {
             int result = 0;
             if (limit != 1) {
                 result = warmup(OSR_CONSTRUCTOR);
@@ -272,7 +272,7 @@
         }
 
         // for constructor test case
-        private Helper(int x) {
+        private SimpleTestCaseHelper(int x) {
             this.x = x;
         }
 
@@ -281,4 +281,4 @@
             return x;
         }
     }
-}
+