--- old/src/hotspot/share/runtime/thread.hpp 2020-02-25 17:44:03.000000000 -0500 +++ new/src/hotspot/share/runtime/thread.hpp 2020-02-25 17:44:02.000000000 -0500 @@ -625,7 +625,7 @@ // For tracking the heavyweight monitor the thread is pending on. ObjectMonitor* current_pending_monitor(ObjectMonitorHandle* omh_p) { - if (omh_p->set_om_ptr_if_safe(_current_pending_monitor)) { + if (omh_p->save_om_ptr_if_safe(_current_pending_monitor)) { return omh_p->om_ptr(); // Return the safe ObjectMonitor*. } return NULL; @@ -651,7 +651,7 @@ // For tracking the ObjectMonitor on which this thread called Object.wait() ObjectMonitor* current_waiting_monitor(ObjectMonitorHandle* omh_p) { - if (omh_p->set_om_ptr_if_safe(_current_waiting_monitor)) { + if (omh_p->save_om_ptr_if_safe(_current_waiting_monitor)) { return omh_p->om_ptr(); // Return the safe ObjectMonitor*. } return NULL;