src/hotspot/share/runtime/objectMonitor.hpp

*** 141,151 ****
    friend class VMStructs;
  
    volatile markOop   _header;       // displaced object header word - mark
    void*     volatile _object;       // backward object pointer - strong root
   public:
!   ObjectMonitor *    FreeNext;      // Free list linkage
   private:
    DEFINE_PAD_MINUS_SIZE(0, DEFAULT_CACHE_LINE_SIZE,
                          sizeof(volatile markOop) + sizeof(void * volatile) +
                          sizeof(ObjectMonitor *));
   protected:                         // protected for JvmtiRawMonitor
--- 141,151 ----
    friend class VMStructs;
  
    volatile markOop   _header;       // displaced object header word - mark
    void*     volatile _object;       // backward object pointer - strong root
   public:
!   ObjectMonitor*     FreeNext;      // Free list linkage
   private:
    DEFINE_PAD_MINUS_SIZE(0, DEFAULT_CACHE_LINE_SIZE,
                          sizeof(volatile markOop) + sizeof(void * volatile) +
                          sizeof(ObjectMonitor *));
   protected:                         // protected for JvmtiRawMonitor
*** 249,259 ****
    //
    #define OM_OFFSET_NO_MONITOR_VALUE_TAG(f) \
      ((ObjectMonitor::f ## _offset_in_bytes()) - markOopDesc::monitor_value)
  
    markOop   header() const;
!   markOopDesc* volatile* header_addr();
    void      set_header(markOop hdr);
  
    intptr_t is_busy() const {
      // TODO-FIXME: merge _count and _waiters.
      // TODO-FIXME: assert _owner == null implies _recursions = 0
--- 249,259 ----
    //
    #define OM_OFFSET_NO_MONITOR_VALUE_TAG(f) \
      ((ObjectMonitor::f ## _offset_in_bytes()) - markOopDesc::monitor_value)
  
    markOop   header() const;
!   volatile markOop* header_addr();
    void      set_header(markOop hdr);
  
    intptr_t is_busy() const {
      // TODO-FIXME: merge _count and _waiters.
      // TODO-FIXME: assert _owner == null implies _recursions = 0