src/hotspot/share/runtime/biasedLocking.cpp

*** 620,630 ****
    log_info(biasedlocking, handshake)("JavaThread " INTPTR_FORMAT " handshaking JavaThread "
                                       INTPTR_FORMAT " to revoke object " INTPTR_FORMAT, p2i(requester),
                                       p2i(biaser), p2i(obj()));
  
    RevokeOneBias revoke(obj, requester, biaser);
!   bool executed = Handshake::execute(&revoke, biaser);
    if (revoke.status_code() == NOT_REVOKED) {
      return NOT_REVOKED;
    }
    if (executed) {
      log_info(biasedlocking, handshake)("Handshake revocation for object " INTPTR_FORMAT " succeeded. Bias was %srevoked",
--- 620,630 ----
    log_info(biasedlocking, handshake)("JavaThread " INTPTR_FORMAT " handshaking JavaThread "
                                       INTPTR_FORMAT " to revoke object " INTPTR_FORMAT, p2i(requester),
                                       p2i(biaser), p2i(obj()));
  
    RevokeOneBias revoke(obj, requester, biaser);
!   bool executed = Handshake::execute_direct(&revoke, biaser);
    if (revoke.status_code() == NOT_REVOKED) {
      return NOT_REVOKED;
    }
    if (executed) {
      log_info(biasedlocking, handshake)("Handshake revocation for object " INTPTR_FORMAT " succeeded. Bias was %srevoked",
*** 664,691 ****
  }
  
  
  // Caller should have instantiated a ResourceMark object before calling this method
  void BiasedLocking::walk_stack_and_revoke(oop obj, JavaThread* biased_locker) {
    assert(!SafepointSynchronize::is_at_safepoint(), "this should always be executed outside safepoints");
!   assert(Thread::current() == biased_locker || Thread::current()->is_VM_thread(), "wrong thread");
  
    markWord mark = obj->mark();
    assert(mark.biased_locker() == biased_locker &&
           obj->klass()->prototype_header().bias_epoch() == mark.bias_epoch(), "invariant");
  
!   log_trace(biasedlocking)("%s(" INTPTR_FORMAT ") revoking object " INTPTR_FORMAT ", mark "
                             INTPTR_FORMAT ", type %s, prototype header " INTPTR_FORMAT
                             ", biaser " INTPTR_FORMAT " %s",
!                            Thread::current()->is_VM_thread() ? "VMThread" : "JavaThread",
!                            p2i(Thread::current()),
                             p2i(obj),
                             mark.value(),
                             obj->klass()->external_name(),
                             obj->klass()->prototype_header().value(),
                             p2i(biased_locker),
!                            Thread::current()->is_VM_thread() ? "" : "(walking own stack)");
  
    markWord unbiased_prototype = markWord::prototype().set_age(obj->mark().age());
  
    GrowableArray<MonitorInfo*>* cached_monitor_info = get_or_compute_monitor_info(biased_locker);
    BasicLock* highest_lock = NULL;
--- 664,691 ----
  }
  
  
  // Caller should have instantiated a ResourceMark object before calling this method
  void BiasedLocking::walk_stack_and_revoke(oop obj, JavaThread* biased_locker) {
+   Thread* cur = Thread::current();
    assert(!SafepointSynchronize::is_at_safepoint(), "this should always be executed outside safepoints");
!   assert(cur == biased_locker || cur == biased_locker->active_handshaker(), "wrong thread");
  
    markWord mark = obj->mark();
    assert(mark.biased_locker() == biased_locker &&
           obj->klass()->prototype_header().bias_epoch() == mark.bias_epoch(), "invariant");
  
!   log_trace(biasedlocking)("JavaThread(" INTPTR_FORMAT ") revoking object " INTPTR_FORMAT ", mark "
                             INTPTR_FORMAT ", type %s, prototype header " INTPTR_FORMAT
                             ", biaser " INTPTR_FORMAT " %s",
!                            p2i(cur),
                             p2i(obj),
                             mark.value(),
                             obj->klass()->external_name(),
                             obj->klass()->prototype_header().value(),
                             p2i(biased_locker),
!                            cur != biased_locker ? "" : "(walking own stack)");
  
    markWord unbiased_prototype = markWord::prototype().set_age(obj->mark().age());
  
    GrowableArray<MonitorInfo*>* cached_monitor_info = get_or_compute_monitor_info(biased_locker);
    BasicLock* highest_lock = NULL;