src/hotspot/share/runtime/synchronizer.cpp

*** 238,248 ****
      // stack-locking in the object's header, the third check is for
      // recursive stack-locking in the displaced header in the BasicLock,
      // and last are the inflated Java Monitor (ObjectMonitor) checks.
      lock->set_displaced_header(markWord::unused_mark());
  
!     if (owner == NULL && Atomic::replace_if_null(self, &(m->_owner))) {
        assert(m->_recursions == 0, "invariant");
        return true;
      }
    }
  
--- 238,248 ----
      // stack-locking in the object's header, the third check is for
      // recursive stack-locking in the displaced header in the BasicLock,
      // and last are the inflated Java Monitor (ObjectMonitor) checks.
      lock->set_displaced_header(markWord::unused_mark());
  
!     if (owner == NULL && Atomic::replace_if_null(&(m->_owner), self)) {
        assert(m->_recursions == 0, "invariant");
        return true;
      }
    }
  
*** 743,753 ****
    hash = mark.hash();
    if (hash == 0) {
      hash = get_next_hash(self, obj);
      temp = mark.copy_set_hash(hash); // merge hash code into header
      assert(temp.is_neutral(), "invariant: header=" INTPTR_FORMAT, temp.value());
!     uintptr_t v = Atomic::cmpxchg(temp.value(), (volatile uintptr_t*)monitor->header_addr(), mark.value());
      test = markWord(v);
      if (test != mark) {
        // The only non-deflation update to the ObjectMonitor's
        // header/dmw field is to merge in the hash code. If someone
        // adds a new usage of the header/dmw field, please update
--- 743,753 ----
    hash = mark.hash();
    if (hash == 0) {
      hash = get_next_hash(self, obj);
      temp = mark.copy_set_hash(hash); // merge hash code into header
      assert(temp.is_neutral(), "invariant: header=" INTPTR_FORMAT, temp.value());
!     uintptr_t v = Atomic::cmpxchg((volatile uintptr_t*)monitor->header_addr(), mark.value(), temp.value());
      test = markWord(v);
      if (test != mark) {
        // The only non-deflation update to the ObjectMonitor's
        // header/dmw field is to merge in the hash code. If someone
        // adds a new usage of the header/dmw field, please update