src/hotspot/share/runtime/synchronizer.cpp

rev 47408 : [mq]: no_cmpxchg_if_null
rev 47406 : [mq]: assembler_cmpxchg
rev 47404 : [mq]: load_ptr_acquire
rev 47401 : [mq]: cmpxchg_if_null
rev 47400 : [mq]: cmpxchg_ptr
rev 47216 : 8187443: Forest Consolidation: Move files to unified layout
Reviewed-by: darcy, ihse

*** 237,247 ****
      // recursive stack-locking in the displaced header in the BasicLock,
      // and last are the inflated Java Monitor (ObjectMonitor) checks.
      lock->set_displaced_header(markOopDesc::unused_mark());
  
      if (owner == NULL &&
!         Atomic::cmpxchg_if_null((void*)Self, &(m->_owner))) {
        assert(m->_recursions == 0, "invariant");
        assert(m->_owner == Self, "invariant");
        return true;
      }
    }
--- 237,247 ----
      // recursive stack-locking in the displaced header in the BasicLock,
      // and last are the inflated Java Monitor (ObjectMonitor) checks.
      lock->set_displaced_header(markOopDesc::unused_mark());
  
      if (owner == NULL &&
!         Atomic::cmpxchg((void*)Self, &(m->_owner), (void*)NULL) == NULL) {
        assert(m->_recursions == 0, "invariant");
        assert(m->_owner == Self, "invariant");
        return true;
      }
    }