src/share/vm/runtime/synchronizer.cpp

rev 11465 : Revert obsolete shared-code changes in runtime synchronizer code

*** 207,217 ****
  
    // If the object is stack-locked by the current thread, try to
    // swing the displaced header from the box back to the mark.
    if (mark == (markOop) lock) {
       assert (dhw->is_neutral(), "invariant") ;
!      if (object->cas_set_mark(dhw, mark) == mark) {
          TEVENT (fast_exit: release stacklock) ;
          return;
       }
    }
  
--- 207,217 ----
  
    // If the object is stack-locked by the current thread, try to
    // swing the displaced header from the box back to the mark.
    if (mark == (markOop) lock) {
       assert (dhw->is_neutral(), "invariant") ;
!      if ((markOop) Atomic::cmpxchg_ptr (dhw, object->mark_addr(), mark) == mark) {
          TEVENT (fast_exit: release stacklock) ;
          return;
       }
    }
  
*** 229,239 ****
  
    if (mark->is_neutral()) {
      // Anticipate successful CAS -- the ST of the displaced mark must
      // be visible <= the ST performed by the CAS.
      lock->set_displaced_header(mark);
!     if (mark == obj()->cas_set_mark((markOop) lock, mark)) {
        TEVENT (slow_enter: release stacklock) ;
        return ;
      }
      // Fall through to inflate() ...
    } else
--- 229,239 ----
  
    if (mark->is_neutral()) {
      // Anticipate successful CAS -- the ST of the displaced mark must
      // be visible <= the ST performed by the CAS.
      lock->set_displaced_header(mark);
!     if (mark == (markOop) Atomic::cmpxchg_ptr(lock, obj()->mark_addr(), mark)) {
        TEVENT (slow_enter: release stacklock) ;
        return ;
      }
      // Fall through to inflate() ...
    } else
*** 648,658 ****
        return hash;
      }
      hash = get_next_hash(Self, obj);  // allocate a new hash code
      temp = mark->copy_set_hash(hash); // merge the hash code into header
      // use (machine word version) atomic operation to install the hash
!     test = obj->cas_set_mark(temp, mark);
      if (test == mark) {
        return hash;
      }
      // If atomic operation failed, we must inflate the header
      // into heavy weight monitor. We could add more code here
--- 648,658 ----
        return hash;
      }
      hash = get_next_hash(Self, obj);  // allocate a new hash code
      temp = mark->copy_set_hash(hash); // merge the hash code into header
      // use (machine word version) atomic operation to install the hash
!     test = (markOop) Atomic::cmpxchg_ptr(temp, obj->mark_addr(), mark);
      if (test == mark) {
        return hash;
      }
      // If atomic operation failed, we must inflate the header
      // into heavy weight monitor. We could add more code here
*** 1213,1223 ****
  
        // CASE: inflated
        if (mark->has_monitor()) {
            ObjectMonitor * inf = mark->monitor() ;
            assert (inf->header()->is_neutral(), "invariant");
!           assert ((oop) inf->object() == object, "invariant") ;
            assert (ObjectSynchronizer::verify_objmon_isinpool(inf), "monitor is invalid");
            return inf ;
        }
  
        // CASE: inflation in progress - inflating over a stack-lock.
--- 1213,1223 ----
  
        // CASE: inflated
        if (mark->has_monitor()) {
            ObjectMonitor * inf = mark->monitor() ;
            assert (inf->header()->is_neutral(), "invariant");
!           assert (inf->object() == object, "invariant") ;
            assert (ObjectSynchronizer::verify_objmon_isinpool(inf), "monitor is invalid");
            return inf ;
        }
  
        // CASE: inflation in progress - inflating over a stack-lock.
*** 1260,1270 ****
            m->_Responsible  = NULL ;
            m->OwnerIsThread = 0 ;
            m->_recursions   = 0 ;
            m->_SpinDuration = ObjectMonitor::Knob_SpinLimit ;   // Consider: maintain by type/class
  
!           markOop cmp = object->cas_set_mark(markOopDesc::INFLATING(), mark);
            if (cmp != mark) {
               omRelease (Self, m, true) ;
               continue ;       // Interference -- just retry
            }
  
--- 1260,1270 ----
            m->_Responsible  = NULL ;
            m->OwnerIsThread = 0 ;
            m->_recursions   = 0 ;
            m->_SpinDuration = ObjectMonitor::Knob_SpinLimit ;   // Consider: maintain by type/class
  
!           markOop cmp = (markOop) Atomic::cmpxchg_ptr (markOopDesc::INFLATING(), object->mark_addr(), mark) ;
            if (cmp != mark) {
               omRelease (Self, m, true) ;
               continue ;       // Interference -- just retry
            }
  
*** 1353,1363 ****
        m->OwnerIsThread = 1 ;
        m->_recursions   = 0 ;
        m->_Responsible  = NULL ;
        m->_SpinDuration = ObjectMonitor::Knob_SpinLimit ;       // consider: keep metastats by type/class
  
!       if (object->cas_set_mark(markOopDesc::encode(m), mark) != mark) {
            m->set_object (NULL) ;
            m->set_owner  (NULL) ;
            m->OwnerIsThread = 0 ;
            m->Recycle() ;
            omRelease (Self, m, true) ;
--- 1353,1363 ----
        m->OwnerIsThread = 1 ;
        m->_recursions   = 0 ;
        m->_Responsible  = NULL ;
        m->_SpinDuration = ObjectMonitor::Knob_SpinLimit ;       // consider: keep metastats by type/class
  
!       if (Atomic::cmpxchg_ptr (markOopDesc::encode(m), object->mark_addr(), mark) != mark) {
            m->set_object (NULL) ;
            m->set_owner  (NULL) ;
            m->OwnerIsThread = 0 ;
            m->Recycle() ;
            omRelease (Self, m, true) ;