src/hotspot/share/runtime/objectMonitor.hpp

rev 57560 : imported patch 8236035.patch.cr0
rev 57561 : dholmes CR - rename simply_set_owner_from() -> set_owner_from() and simply_set_owner_from_BasicLock() -> set_owner_from_BasicLock(); rename release_clear_owner_with_barrier() -> release_clear_owner() and refactor barrier code back into the call sites.
rev 57562 : kbarrett CR - rearrange some loads of _owner field to be more efficient; clarify header comment for try_set_owner_from() declaration; make some loads of _owner field DEBUG_ONLY since they only exist for assert()'s; update related logging calls to use the existing function parameter instead.

*** 237,247 ****
    // Simply set _owner field to new_value; current value must match old_value.
    void      set_owner_from(void* old_value, void* new_value);
    // Simply set _owner field to self; current value must match basic_lock_p.
    void      set_owner_from_BasicLock(void* basic_lock_p, Thread* self);
    // Try to set _owner field to new_value if the current value matches
!   // old_value. Otherwise, does not change the _owner field.
    void*     try_set_owner_from(void* old_value, void* new_value);
  
    jint      waiters() const;
  
    jint      contentions() const;
--- 237,249 ----
    // Simply set _owner field to new_value; current value must match old_value.
    void      set_owner_from(void* old_value, void* new_value);
    // Simply set _owner field to self; current value must match basic_lock_p.
    void      set_owner_from_BasicLock(void* basic_lock_p, Thread* self);
    // Try to set _owner field to new_value if the current value matches
!   // old_value. Otherwise, does not change the _owner field. Returns
!   // the prior value of the _owner field. try_set_owner_from() provides:
!   //   <fence> compare-and-exchange <membar StoreLoad|StoreStore>
    void*     try_set_owner_from(void* old_value, void* new_value);
  
    jint      waiters() const;
  
    jint      contentions() const;