src/hotspot/share/utilities/globalDefinitions.hpp

*** 962,10 ***
--- 962,19 ---
    _thread_blocked           = 10, // blocked in vm
    _thread_blocked_trans     = 11, // corresponding transition state
    _thread_max_state         = 12  // maximum thread state+1 - used for statistics allocation
  };
  
+ enum LockingMode {
+   // Use only heavy monitors for locking
+   LM_MONITOR     = 0,
+   // Legacy stack-locking, with monitors as 2nd tier
+   LM_LEGACY      = 1,
+   // New lightweight locking, with monitors as 2nd tier
+   LM_LIGHTWEIGHT = 2
+ };
+ 
  //----------------------------------------------------------------------------------------------------
  // Special constants for debugging
  
  const jint     badInt           = -3;                       // generic "bad int" value
  const intptr_t badAddressVal    = -2;                       // generic "bad address" value

*** 979,11 ***
  const juint    uninitMetaWordVal= 0xf7f7f7f7;               // value used to zap newly allocated metachunk
  const juint    badHeapWordVal   = 0xBAADBABE;               // value used to zap heap after GC
  const juint    badMetaWordVal   = 0xBAADFADE;               // value used to zap metadata heap after GC
  const int      badCodeHeapNewVal= 0xCC;                     // value used to zap Code heap at allocation
  const int      badCodeHeapFreeVal = 0xDD;                   // value used to zap Code heap at deallocation
! 
  
  // (These must be implemented as #defines because C++ compilers are
  // not obligated to inline non-integral constants!)
  #define       badAddress        ((address)::badAddressVal)
  #define       badOop            (cast_to_oop(::badOopVal))
--- 988,12 ---
  const juint    uninitMetaWordVal= 0xf7f7f7f7;               // value used to zap newly allocated metachunk
  const juint    badHeapWordVal   = 0xBAADBABE;               // value used to zap heap after GC
  const juint    badMetaWordVal   = 0xBAADFADE;               // value used to zap metadata heap after GC
  const int      badCodeHeapNewVal= 0xCC;                     // value used to zap Code heap at allocation
  const int      badCodeHeapFreeVal = 0xDD;                   // value used to zap Code heap at deallocation
! const intptr_t badDispHeaderDeopt = 0xDE0BD000;             // value to fill unused displaced header during deoptimization
+ const intptr_t badDispHeaderOSR   = 0xDEAD05A0;             // value to fill unused displaced header during OSR
  
  // (These must be implemented as #defines because C++ compilers are
  // not obligated to inline non-integral constants!)
  #define       badAddress        ((address)::badAddressVal)
  #define       badOop            (cast_to_oop(::badOopVal))