src/hotspot/share/gc/z/zBarrierSet.inline.hpp

*** 130,158 ****
    return load_barrier_on_oop_field_preloaded(addr, o);
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <typename T>
! inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_cmpxchg_in_heap(oop new_value, T* addr, oop compare_value) {
    verify_decorators_present<ON_STRONG_OOP_REF>();
    verify_decorators_absent<AS_NO_KEEPALIVE>();
  
    ZBarrier::load_barrier_on_oop_field(addr);
!   return Raw::oop_atomic_cmpxchg_in_heap(new_value, addr, compare_value);
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
! inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_cmpxchg_in_heap_at(oop new_value, oop base, ptrdiff_t offset, oop compare_value) {
    verify_decorators_present<ON_STRONG_OOP_REF | ON_UNKNOWN_OOP_REF>();
    verify_decorators_absent<AS_NO_KEEPALIVE>();
  
    // Through Unsafe.CompareAndExchangeObject()/CompareAndSetObject() we can receive
    // calls with ON_UNKNOWN_OOP_REF set. However, we treat these as ON_STRONG_OOP_REF,
    // with the motivation that if you're doing Unsafe operations on a Reference.referent
    // field, then you're on your own anyway.
    ZBarrier::load_barrier_on_oop_field(field_addr(base, offset));
!   return Raw::oop_atomic_cmpxchg_in_heap_at(new_value, base, offset, compare_value);
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <typename T>
  inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap(T* addr, oop new_value) {
--- 130,158 ----
    return load_barrier_on_oop_field_preloaded(addr, o);
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <typename T>
! inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_cmpxchg_in_heap(T* addr, oop compare_value, oop new_value) {
    verify_decorators_present<ON_STRONG_OOP_REF>();
    verify_decorators_absent<AS_NO_KEEPALIVE>();
  
    ZBarrier::load_barrier_on_oop_field(addr);
!   return Raw::oop_atomic_cmpxchg_in_heap(addr, compare_value, new_value);
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
! inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_cmpxchg_in_heap_at(oop base, ptrdiff_t offset, oop compare_value, oop new_value) {
    verify_decorators_present<ON_STRONG_OOP_REF | ON_UNKNOWN_OOP_REF>();
    verify_decorators_absent<AS_NO_KEEPALIVE>();
  
    // Through Unsafe.CompareAndExchangeObject()/CompareAndSetObject() we can receive
    // calls with ON_UNKNOWN_OOP_REF set. However, we treat these as ON_STRONG_OOP_REF,
    // with the motivation that if you're doing Unsafe operations on a Reference.referent
    // field, then you're on your own anyway.
    ZBarrier::load_barrier_on_oop_field(field_addr(base, offset));
!   return Raw::oop_atomic_cmpxchg_in_heap_at(base, offset, compare_value, new_value);
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <typename T>
  inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap(T* addr, oop new_value) {
*** 220,234 ****
    return load_barrier_on_oop_field_preloaded(addr, o);
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <typename T>
! inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_cmpxchg_not_in_heap(oop new_value, T* addr, oop compare_value) {
    verify_decorators_present<ON_STRONG_OOP_REF>();
    verify_decorators_absent<AS_NO_KEEPALIVE>();
  
!   return Raw::oop_atomic_cmpxchg_not_in_heap(new_value, addr, compare_value);
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <typename T>
  inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_not_in_heap(T* addr, oop new_value) {
--- 220,234 ----
    return load_barrier_on_oop_field_preloaded(addr, o);
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <typename T>
! inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_cmpxchg_not_in_heap(T* addr, oop compare_value, oop new_value) {
    verify_decorators_present<ON_STRONG_OOP_REF>();
    verify_decorators_absent<AS_NO_KEEPALIVE>();
  
!   return Raw::oop_atomic_cmpxchg_not_in_heap(addr, compare_value, new_value);
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <typename T>
  inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_not_in_heap(T* addr, oop new_value) {