src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp

*** 639,13 ***
                mon->lock()->set_displaced_header(markWord::from_pointer(nullptr));
              } else {
                success = false;
              }
            }
-           if (success) {
-             THREAD->inc_held_monitor_count();
-           }
          }
          if (!success) {
              CALL_VM(InterpreterRuntime::monitorenter(THREAD, mon), handle_exception);
          }
  
--- 639,10 ---

*** 743,13 ***
              entry->lock()->set_displaced_header(markWord::from_pointer(nullptr));
            } else {
              success = false;
            }
          }
-         if (success) {
-           THREAD->inc_held_monitor_count();
-         }
        }
        if (!success) {
          CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
        }
  
--- 740,10 ---

*** 1678,13 ***
                  entry->lock()->set_displaced_header(markWord::from_pointer(nullptr));
                } else {
                  success = false;
                }
              }
-             if (success) {
-               THREAD->inc_held_monitor_count();
-             }
            }
            if (!success) {
              CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
            }
  
--- 1672,10 ---

*** 1718,13 ***
                    // restore object for the slow case
                    most_recent->set_obj(lockee);
                    success = false;
                  }
                }
-               if (success) {
-                 THREAD->dec_held_monitor_count();
-               }
              }
              if (!success) {
                InterpreterRuntime::monitorexit(most_recent);
              }
              UPDATE_PC_AND_TOS_AND_CONTINUE(1, -1);
--- 1709,10 ---

*** 3161,13 ***
                  // restore object for the slow case
                  end->set_obj(lockee);
                  success = false;
                }
              }
-             if (success) {
-               THREAD->dec_held_monitor_count();
-             }
            }
            if (!success) {
              InterpreterRuntime::monitorexit(end);
            }
  
--- 3149,10 ---

*** 3240,13 ***
                    if (!suppress_error) illegal_state_oop = Handle(THREAD, THREAD->pending_exception());
                    THREAD->clear_pending_exception();
                  }
                }
              }
-             if (dec_monitor_count) {
-               THREAD->dec_held_monitor_count();
-             }
            }
          }
        }
      }
      // Clear the do_not_unlock flag now.
--- 3225,10 ---