src/hotspot/share/runtime/thread.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.

@@ -623,11 +623,11 @@
   int vm_operation_completed_count()             { return _vm_operation_completed_count; }
   void increment_vm_operation_completed_count()  { _vm_operation_completed_count++; }
 
   // 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;
   }
   void set_current_pending_monitor(ObjectMonitor* monitor) {

@@ -649,11 +649,11 @@
     return _current_pending_monitor_is_from_java;
   }
 
   // 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;
   }
   void set_current_waiting_monitor(ObjectMonitor* monitor) {