test/compiler/whitebox/CompilerWhiteBoxTest.java

*** 18,27 ****
--- 18,28 ----
   *
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
+ package compiler.whitebox;
  
  import sun.hotspot.WhiteBox;
  import sun.hotspot.code.NMethod;
  
  import java.lang.reflect.Constructor;
*** 36,58 ****
   *
   * @author igor.ignatyev@oracle.com
   */
  public abstract class CompilerWhiteBoxTest {
      /** {@code CompLevel::CompLevel_none} -- Interpreter */
!     protected static final int COMP_LEVEL_NONE = 0;
      /** {@code CompLevel::CompLevel_any}, {@code CompLevel::CompLevel_all} */
!     protected static final int COMP_LEVEL_ANY = -1;
      /** {@code CompLevel::CompLevel_simple} -- C1 */
!     protected static final int COMP_LEVEL_SIMPLE = 1;
      /** {@code CompLevel::CompLevel_limited_profile} -- C1, invocation & backedge counters */
!     protected static final int COMP_LEVEL_LIMITED_PROFILE = 2;
      /** {@code CompLevel::CompLevel_full_profile} -- C1, invocation & backedge counters + mdo */
!     protected static final int COMP_LEVEL_FULL_PROFILE = 3;
      /** {@code CompLevel::CompLevel_full_optimization} -- C2 or Shark */
!     protected static final int COMP_LEVEL_FULL_OPTIMIZATION = 4;
      /** Maximal value for CompLevel */
!     protected static final int COMP_LEVEL_MAX = COMP_LEVEL_FULL_OPTIMIZATION;
  
      /** Instance of WhiteBox */
      protected static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
      /** Value of {@code -XX:CompileThreshold} */
      protected static final int COMPILE_THRESHOLD
--- 37,59 ----
   *
   * @author igor.ignatyev@oracle.com
   */
  public abstract class CompilerWhiteBoxTest {
      /** {@code CompLevel::CompLevel_none} -- Interpreter */
!     public static final int COMP_LEVEL_NONE = 0;
      /** {@code CompLevel::CompLevel_any}, {@code CompLevel::CompLevel_all} */
!     public static final int COMP_LEVEL_ANY = -1;
      /** {@code CompLevel::CompLevel_simple} -- C1 */
!     public static final int COMP_LEVEL_SIMPLE = 1;
      /** {@code CompLevel::CompLevel_limited_profile} -- C1, invocation & backedge counters */
!     public static final int COMP_LEVEL_LIMITED_PROFILE = 2;
      /** {@code CompLevel::CompLevel_full_profile} -- C1, invocation & backedge counters + mdo */
!     public static final int COMP_LEVEL_FULL_PROFILE = 3;
      /** {@code CompLevel::CompLevel_full_optimization} -- C2 or Shark */
!     public static final int COMP_LEVEL_FULL_OPTIMIZATION = 4;
      /** Maximal value for CompLevel */
!     public static final int COMP_LEVEL_MAX = COMP_LEVEL_FULL_OPTIMIZATION;
  
      /** Instance of WhiteBox */
      protected static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
      /** Value of {@code -XX:CompileThreshold} */
      protected static final int COMPILE_THRESHOLD
*** 310,320 ****
      /**
       * Waits for completion of background compilation of the given executable.
       *
       * @param executable Executable
       */
!     protected static final void waitBackgroundCompilation(Executable executable) {
          if (!BACKGROUND_COMPILATION) {
              return;
          }
          final Object obj = new Object();
          for (int i = 0; i < 10
--- 311,321 ----
      /**
       * Waits for completion of background compilation of the given executable.
       *
       * @param executable Executable
       */
!     public static final void waitBackgroundCompilation(Executable executable) {
          if (!BACKGROUND_COMPILATION) {
              return;
          }
          final Object obj = new Object();
          for (int i = 0; i < 10
*** 439,449 ****
       * Skip the test for the specified value of Tiered Compilation
       * @param value of TieredCompilation the test should not run with
       * @return {@code true} if the test should be skipped,
       *         {@code false} otherwise
       */
!     protected static boolean skipOnTieredCompilation(boolean value) {
          if (value == CompilerWhiteBoxTest.TIERED_COMPILATION) {
              System.err.println("Test isn't applicable w/ "
                      + (value ? "enabled" : "disabled")
                      + "TieredCompilation. Skip test.");
              return true;
--- 440,450 ----
       * Skip the test for the specified value of Tiered Compilation
       * @param value of TieredCompilation the test should not run with
       * @return {@code true} if the test should be skipped,
       *         {@code false} otherwise
       */
!     public static boolean skipOnTieredCompilation(boolean value) {
          if (value == CompilerWhiteBoxTest.TIERED_COMPILATION) {
              System.err.println("Test isn't applicable w/ "
                      + (value ? "enabled" : "disabled")
                      + "TieredCompilation. Skip test.");
              return true;