review: restored the set_current_pending_monitor(this) position

sspitsyn · Jan 16, 2025 · 369c39b · 369c39b
1 parent bb3054f
commit 369c39b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -492,6 +492,9 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread *current, ObjectMonito
 
   freeze_result result;
 
+  assert(current->current_pending_monitor() == nullptr, "invariant");
+  current->set_current_pending_monitor(this);
+
   DTRACE_MONITOR_PROBE(contended__enter, this, object(), current);
   if (JvmtiExport::should_post_monitor_contended_enter()) {
     JvmtiExport::post_monitor_contended_enter(current, this);
@@ -531,9 +534,6 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread *current, ObjectMonito
     // Change java thread status to indicate blocked on monitor enter.
     JavaThreadBlockedOnMonitorEnterState jtbmes(current, this);
 
-    assert(current->current_pending_monitor() == nullptr, "invariant");
-    current->set_current_pending_monitor(this);
-
     OSThreadContendState osts(current->osthread());
 
     assert(current->thread_state() == _thread_in_vm, "invariant");