--- old/src/hotspot/share/runtime/objectMonitor.hpp	2019-11-04 14:59:02.000000000 -0500
+++ new/src/hotspot/share/runtime/objectMonitor.hpp	2019-11-04 14:59:02.000000000 -0500
@@ -274,10 +274,12 @@
   bool      owner_is_DEFLATER_MARKER();
   // Set _owner field to new_value; current value must match old_value.
   void      set_owner_from(void* new_value, void* old_value);
-  // Set _owner field to new_value; current value must match old_value1 or old_value2.
-  void      set_owner_from(void* new_value, void* old_value1, void* old_value2);
-  // Set _owner field to self; current value must match basic_lock_p.
-  void      set_owner_from_BasicLock(Thread* self, void* basic_lock_p);
+  // Simply set _owner field to new_value; current value must match old_value.
+  void      simply_set_owner_from(void* new_value, void* old_value);
+  // Simply set _owner field to new_value; current value must match old_value1 or old_value2.
+  void      simply_set_owner_from(void* new_value, void* old_value1, void* old_value2);
+  // Simply set _owner field to self; current value must match basic_lock_p.
+  void      simply_set_owner_from_BasicLock(Thread* self, void* basic_lock_p);
   // Try to set _owner field to new_value if the current value matches
   // old_value. Otherwise, does not change the _owner field.
   void*     try_set_owner_from(void* new_value, void* old_value);
@@ -327,7 +329,6 @@
   void      set_allocation_state(AllocationState s);
   AllocationState allocation_state() const;
   bool      is_free() const;
-  bool      is_active() const;
   bool      is_old() const;
   bool      is_new() const;
   void      dec_ref_count();
@@ -383,9 +384,11 @@
   // 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 used by ObjectSynchronizer::monitors_iterate().
-  ObjectMonitorHandle(ObjectMonitor* _om_ptr);
   // For internal use by ObjectSynchronizer::inflate().
   void set_om_ptr(ObjectMonitor* om_ptr);
 };