RFR: 8367982: Unify ObjectSynchronizer and LightweightSynchronizer [v2]

[Fredrik Bredberg]

On Thu, 23 Oct 2025 17:07:40 GMT, Patricio Chilano Mateo <pchilanomate at openjdk.org> wrote:

>> Fredrik Bredberg has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Update after review
>
> src/hotspot/share/oops/markWord.hpp line 215:
> 
>> 213:   ObjectMonitor* monitor() const {
>> 214:     assert(has_monitor(), "check");
>> 215:     assert(!UseObjectMonitorTable, "Fast locking with OM table does not use markWord for monitors");
> 
> Suggestion:
> 
>     assert(!UseObjectMonitorTable, "Locking with OM table does not use markWord for monitors");

Fixed

> src/hotspot/share/oops/markWord.hpp line 241:
> 
>> 239:   }
>> 240:   static markWord encode(ObjectMonitor* monitor) {
>> 241:     assert(!UseObjectMonitorTable, "Fast locking with OM table does not use markWord for monitors");
> 
> Suggestion:
> 
>     assert(!UseObjectMonitorTable, "Locking with OM table does not use markWord for monitors");

Fixed

> src/hotspot/share/runtime/objectMonitor.hpp line 164:
> 
>> 162:   // Because of frequent access, the metadata field is at offset zero (0).
>> 163:   // Enforced by the assert() in metadata_addr().
>> 164:   // * Fast locking with UseObjectMonitorTable:
> 
> Suggestion:
> 
>   // * Locking with UseObjectMonitorTable:

Fixed

> src/hotspot/share/runtime/objectMonitor.hpp line 166:
> 
>> 164:   // * Fast locking with UseObjectMonitorTable:
>> 165:   //   Contains the _object's hashCode.
>> 166:   // * * Fast locking without UseObjectMonitorTable:
> 
> Suggestion:
> 
>   // * Locking without UseObjectMonitorTable:

Fixed

> src/hotspot/share/runtime/objectMonitor.inline.hpp line 77:
> 
>> 75: 
>> 76: inline markWord ObjectMonitor::header() const {
>> 77:   assert(!UseObjectMonitorTable, "Fast locking with OM table does not use header");
> 
> Suggestion:
> 
>   assert(!UseObjectMonitorTable, "Locking with OM table does not use header");

Fixed

> src/hotspot/share/runtime/objectMonitor.inline.hpp line 82:
> 
>> 80: 
>> 81: inline void ObjectMonitor::set_header(markWord hdr) {
>> 82:   assert(!UseObjectMonitorTable, "Fast locking with OM table does not use header");
> 
> Suggestion:
> 
>   assert(!UseObjectMonitorTable, "Locking with OM table does not use header");

Fixed

> src/hotspot/share/runtime/objectMonitor.inline.hpp line 87:
> 
>> 85: 
>> 86: inline intptr_t ObjectMonitor::hash() const {
>> 87:   assert(UseObjectMonitorTable, "Only used by fast locking with OM table");
> 
> Suggestion:
> 
>   assert(UseObjectMonitorTable, "Only used by locking with OM table");

Fixed

> src/hotspot/share/runtime/objectMonitor.inline.hpp line 92:
> 
>> 90: 
>> 91: inline void ObjectMonitor::set_hash(intptr_t hash) {
>> 92:   assert(UseObjectMonitorTable, "Only used by fast locking with OM table");
> 
> Suggestion:
> 
>   assert(UseObjectMonitorTable, "Only used by locking with OM table");

Fixed

-------------

PR Review Comment: https://git.openjdk.org/jdk/pull/27915#discussion_r2460715777
PR Review Comment: https://git.openjdk.org/jdk/pull/27915#discussion_r2460716434
PR Review Comment: https://git.openjdk.org/jdk/pull/27915#discussion_r2460717622
PR Review Comment: https://git.openjdk.org/jdk/pull/27915#discussion_r2460718167
PR Review Comment: https://git.openjdk.org/jdk/pull/27915#discussion_r2460718815
PR Review Comment: https://git.openjdk.org/jdk/pull/27915#discussion_r2460719494
PR Review Comment: https://git.openjdk.org/jdk/pull/27915#discussion_r2460722858
PR Review Comment: https://git.openjdk.org/jdk/pull/27915#discussion_r2460721685