src/share/vm/utilities/globalDefinitions.hpp

*** 901,924 ****
    CompLevel_all               = -1,
    CompLevel_none              = 0,         // Interpreter
    CompLevel_simple            = 1,         // C1
    CompLevel_limited_profile   = 2,         // C1, invocation & backedge counters
    CompLevel_full_profile      = 3,         // C1, invocation & backedge counters + mdo
!   CompLevel_full_optimization = 4,         // C2 or Shark
  
! #if defined(COMPILER2) || defined(SHARK)
!   CompLevel_highest_tier      = CompLevel_full_optimization,  // pure C2 and tiered
  #elif defined(COMPILER1)
!   CompLevel_highest_tier      = CompLevel_simple,             // pure C1
  #else
    CompLevel_highest_tier      = CompLevel_none,
  #endif
  
  #if defined(TIERED)
    CompLevel_initial_compile   = CompLevel_full_profile        // tiered
! #elif defined(COMPILER1)
!   CompLevel_initial_compile   = CompLevel_simple              // pure C1
  #elif defined(COMPILER2) || defined(SHARK)
    CompLevel_initial_compile   = CompLevel_full_optimization   // pure C2
  #else
    CompLevel_initial_compile   = CompLevel_none
  #endif
--- 901,924 ----
    CompLevel_all               = -1,
    CompLevel_none              = 0,         // Interpreter
    CompLevel_simple            = 1,         // C1
    CompLevel_limited_profile   = 2,         // C1, invocation & backedge counters
    CompLevel_full_profile      = 3,         // C1, invocation & backedge counters + mdo
!   CompLevel_full_optimization = 4,         // C2, Shark or JVMCI
  
! #if defined(COMPILER2) || defined(SHARK) || INCLUDE_JVMCI
!   CompLevel_highest_tier      = CompLevel_full_optimization,  // pure C2 and tiered or JVMCI and tiered
  #elif defined(COMPILER1)
!   CompLevel_highest_tier      = CompLevel_simple,             // pure C1 or JVMCI
  #else
    CompLevel_highest_tier      = CompLevel_none,
  #endif
  
  #if defined(TIERED)
    CompLevel_initial_compile   = CompLevel_full_profile        // tiered
! #elif defined(COMPILER1) || INCLUDE_JVMCI
!   CompLevel_initial_compile   = CompLevel_simple              // pure C1 or JVMCI
  #elif defined(COMPILER2) || defined(SHARK)
    CompLevel_initial_compile   = CompLevel_full_optimization   // pure C2
  #else
    CompLevel_initial_compile   = CompLevel_none
  #endif