--- old/src/hotspot/share/runtime/objectMonitor.inline.hpp 2020-07-13 15:32:46.000000000 -0400 +++ new/src/hotspot/share/runtime/objectMonitor.inline.hpp 2020-07-13 15:32:46.000000000 -0400 @@ -124,9 +124,9 @@ inline void ObjectMonitor::release_clear_owner(void* old_value) { #ifdef ASSERT void* prev = Atomic::load(&_owner); -#endif assert(prev == old_value, "unexpected prev owner=" INTPTR_FORMAT ", expected=" INTPTR_FORMAT, p2i(prev), p2i(old_value)); +#endif Atomic::release_store(&_owner, (void*)NULL); log_trace(monitorinflation, owner)("release_clear_owner(): mid=" INTPTR_FORMAT ", old_value=" INTPTR_FORMAT, @@ -138,9 +138,9 @@ inline void ObjectMonitor::set_owner_from(void* old_value, void* new_value) { #ifdef ASSERT void* prev = Atomic::load(&_owner); -#endif assert(prev == old_value, "unexpected prev owner=" INTPTR_FORMAT ", expected=" INTPTR_FORMAT, p2i(prev), p2i(old_value)); +#endif Atomic::store(&_owner, new_value); log_trace(monitorinflation, owner)("set_owner_from(): mid=" INTPTR_FORMAT ", old_value=" INTPTR_FORMAT @@ -169,9 +169,9 @@ inline void ObjectMonitor::set_owner_from_BasicLock(void* basic_lock_p, Thread* self) { #ifdef ASSERT void* prev = Atomic::load(&_owner); -#endif assert(prev == basic_lock_p, "unexpected prev owner=" INTPTR_FORMAT ", expected=" INTPTR_FORMAT, p2i(prev), p2i(basic_lock_p)); +#endif // Non-null owner field to non-null owner field is safe without // cmpxchg() as long as all readers can tolerate either flavor. Atomic::store(&_owner, self);