src/hotspot/share/runtime/objectMonitor.hpp

rev 58110 : v2.09a with 8235795, 8235931 and 8236035 extracted; rebased to jdk-14+28; merge with 8236035.patch.cr1; merge with 8235795.patch.cr1; merge with 8236035.patch.cr2; merge with 8235795.patch.cr2; merge with 8235795.patch.cr3.
rev 58111 : See CR9-to-CR10-changes; merge with jdk-15+11.

*** 221,231 ****
    // TODO-FIXME: the "offset" routines should return a type of off_t instead of int ...
    // ByteSize would also be an appropriate type.
    static int header_offset_in_bytes()      { return offset_of(ObjectMonitor, _header); }
    static int object_offset_in_bytes()      { return offset_of(ObjectMonitor, _object); }
    static int owner_offset_in_bytes()       { return offset_of(ObjectMonitor, _owner); }
-   static int ref_count_offset_in_bytes()   { return offset_of(ObjectMonitor, _ref_count); }
    static int recursions_offset_in_bytes()  { return offset_of(ObjectMonitor, _recursions); }
    static int cxq_offset_in_bytes()         { return offset_of(ObjectMonitor, _cxq); }
    static int succ_offset_in_bytes()        { return offset_of(ObjectMonitor, _succ); }
    static int EntryList_offset_in_bytes()   { return offset_of(ObjectMonitor, _EntryList); }
  
--- 221,230 ----
*** 394,404 ****
    ObjectMonitor* om_ptr() const { return _om_ptr; }
    // Save the ObjectMonitor* associated with the specified markWord and
    // increment the ref_count.
    bool save_om_ptr(oop object, markWord mark);
    // Save the specified ObjectMonitor* if safe and increment the ref_count.
!   bool set_om_ptr_if_safe(ObjectMonitor* om_ptr);
    // Unset the _om_ptr field and decrement the ref_count.
    void unset_om_ptr();
  
    // For internal use by ObjectSynchronizer::inflate().
    void set_om_ptr(ObjectMonitor* om_ptr);
--- 393,403 ----
    ObjectMonitor* om_ptr() const { return _om_ptr; }
    // Save the ObjectMonitor* associated with the specified markWord and
    // increment the ref_count.
    bool save_om_ptr(oop object, markWord mark);
    // Save the specified ObjectMonitor* if safe and increment the ref_count.
!   bool save_om_ptr_if_safe(ObjectMonitor* om_ptr);
    // Unset the _om_ptr field and decrement the ref_count.
    void unset_om_ptr();
  
    // For internal use by ObjectSynchronizer::inflate().
    void set_om_ptr(ObjectMonitor* om_ptr);