test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java

@@ -248,12 +248,15 @@
          checkForcedCompilationsCompleted();
          runTests();
      }
  
      private void setupTests() {
-         for (Class<?> clazz : testClass.getDeclaredClasses()) {
-             checkAnnotationsInClass(clazz, "inner");
+         // TODO remove this once JDK-8273591 is fixed
+         if (!IGNORE_COMPILER_CONTROLS) {
+             for (Class<?> clazz : testClass.getDeclaredClasses()) {
+                 checkAnnotationsInClass(clazz, "inner");
+             }
          }
          if (DUMP_REPLAY) {
              addReplay();
          }
          // Make sure to first setup test methods and make them non-inlineable and only then process compile commands.

@@ -889,27 +892,27 @@
      public static boolean isCompiledAtLevel(Method m, CompLevel compLevel) {
          return compiledAtLevel(m, compLevel) == TriState.Yes;
      }
  
      public static void assertDeoptimizedByC1(Method m) {
-         if (notUnstableDeoptAssertion(m, CompLevel.C1_SIMPLE)) {
+         if (isStableDeopt(m, CompLevel.C1_SIMPLE)) {
              TestRun.check(compiledByC1(m) != TriState.Yes || PER_METHOD_TRAP_LIMIT == 0 || !PROFILE_INTERPRETER,
                            m + " should have been deoptimized by C1");
          }
      }
  
      public static void assertDeoptimizedByC2(Method m) {
-         if (notUnstableDeoptAssertion(m, CompLevel.C2)) {
+         if (isStableDeopt(m, CompLevel.C2)) {
              TestRun.check(compiledByC2(m) != TriState.Yes || PER_METHOD_TRAP_LIMIT == 0 || !PROFILE_INTERPRETER,
                            m + " should have been deoptimized by C2");
          }
      }
  
      /**
       * Some VM flags could make the deopt assertions unstable.
       */
-     private static boolean notUnstableDeoptAssertion(Method m, CompLevel level) {
+     public static boolean isStableDeopt(Method m, CompLevel level) {
          return (USE_COMPILER && !XCOMP && !IGNORE_COMPILER_CONTROLS && !TEST_C1 &&
                  (!EXCLUDE_RANDOM || WHITE_BOX.isMethodCompilable(m, level.getValue(), false)));
      }
  
      public static void assertCompiledByC1(Method m) {