src/hotspot/share/interpreter/interpreterRuntime.cpp

*** 769,784 ****
      Atomic::inc(BiasedLocking::slow_path_entry_count_addr());
    }
    Handle h_obj(thread, elem->obj());
    assert(Universe::heap()->is_in_reserved_or_null(h_obj()),
           "must be NULL or an object");
!   if (UseBiasedLocking) {
!     // Retry fast entry if bias is revoked to avoid unnecessary inflation
!     ObjectSynchronizer::fast_enter(h_obj, elem->lock(), true, CHECK);
!   } else {
!     ObjectSynchronizer::slow_enter(h_obj, elem->lock(), CHECK);
!   }
    assert(Universe::heap()->is_in_reserved_or_null(elem->obj()),
           "must be NULL or an object");
  #ifdef ASSERT
    thread->last_frame().interpreter_frame_verify_monitor(elem);
  #endif
--- 769,779 ----
      Atomic::inc(BiasedLocking::slow_path_entry_count_addr());
    }
    Handle h_obj(thread, elem->obj());
    assert(Universe::heap()->is_in_reserved_or_null(h_obj()),
           "must be NULL or an object");
!   ObjectSynchronizer::enter(h_obj, elem->lock(), CHECK);
    assert(Universe::heap()->is_in_reserved_or_null(elem->obj()),
           "must be NULL or an object");
  #ifdef ASSERT
    thread->last_frame().interpreter_frame_verify_monitor(elem);
  #endif
*** 794,804 ****
    assert(Universe::heap()->is_in_reserved_or_null(h_obj()),
           "must be NULL or an object");
    if (elem == NULL || h_obj()->is_unlocked()) {
      THROW(vmSymbols::java_lang_IllegalMonitorStateException());
    }
!   ObjectSynchronizer::slow_exit(h_obj(), elem->lock(), thread);
    // Free entry. This must be done here, since a pending exception might be installed on
    // exit. If it is not cleared, the exception handling code will try to unlock the monitor again.
    elem->set_obj(NULL);
  #ifdef ASSERT
    thread->last_frame().interpreter_frame_verify_monitor(elem);
--- 789,799 ----
    assert(Universe::heap()->is_in_reserved_or_null(h_obj()),
           "must be NULL or an object");
    if (elem == NULL || h_obj()->is_unlocked()) {
      THROW(vmSymbols::java_lang_IllegalMonitorStateException());
    }
!   ObjectSynchronizer::exit(h_obj(), elem->lock(), thread);
    // Free entry. This must be done here, since a pending exception might be installed on
    // exit. If it is not cleared, the exception handling code will try to unlock the monitor again.
    elem->set_obj(NULL);
  #ifdef ASSERT
    thread->last_frame().interpreter_frame_verify_monitor(elem);