src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp

*** 140,150 ****
    template <DecoratorSet decorators, typename BarrierSetT = ShenandoahBarrierSet>
    class AccessBarrier: public BarrierSet::AccessBarrier<decorators, BarrierSetT> {
      typedef BarrierSet::AccessBarrier<decorators, BarrierSetT> Raw;
  
      template <typename T>
!     static oop oop_atomic_cmpxchg_in_heap_impl(oop new_value, T* addr, oop compare_value);
  
      template <typename T>
      static oop oop_atomic_xchg_in_heap_impl(T* addr, oop new_value);
  
    public:
--- 140,150 ----
    template <DecoratorSet decorators, typename BarrierSetT = ShenandoahBarrierSet>
    class AccessBarrier: public BarrierSet::AccessBarrier<decorators, BarrierSetT> {
      typedef BarrierSet::AccessBarrier<decorators, BarrierSetT> Raw;
  
      template <typename T>
!     static oop oop_atomic_cmpxchg_in_heap_impl(T* addr, oop compare_value, oop new_value);
  
      template <typename T>
      static oop oop_atomic_xchg_in_heap_impl(T* addr, oop new_value);
  
    public:
*** 158,169 ****
      template <typename T>
      static void oop_store_in_heap(T* addr, oop value);
      static void oop_store_in_heap_at(oop base, ptrdiff_t offset, oop value);
  
      template <typename T>
!     static oop oop_atomic_cmpxchg_in_heap(oop new_value, T* addr, oop compare_value);
!     static oop oop_atomic_cmpxchg_in_heap_at(oop new_value, oop base, ptrdiff_t offset, oop compare_value);
  
      template <typename T>
      static oop oop_atomic_xchg_in_heap(T* addr, oop new_value);
      static oop oop_atomic_xchg_in_heap_at(oop base, ptrdiff_t offset, oop new_value);
  
--- 158,169 ----
      template <typename T>
      static void oop_store_in_heap(T* addr, oop value);
      static void oop_store_in_heap_at(oop base, ptrdiff_t offset, oop value);
  
      template <typename T>
!     static oop oop_atomic_cmpxchg_in_heap(T* addr, oop compare_value, oop new_value);
!     static oop oop_atomic_cmpxchg_in_heap_at(oop base, ptrdiff_t offset, oop compare_value, oop new_value);
  
      template <typename T>
      static oop oop_atomic_xchg_in_heap(T* addr, oop new_value);
      static oop oop_atomic_xchg_in_heap_at(oop base, ptrdiff_t offset, oop new_value);
  
*** 182,192 ****
      // Used for catching bad stores
      template <typename T>
      static void oop_store_not_in_heap(T* addr, oop value);
  
      template <typename T>
!     static oop oop_atomic_cmpxchg_not_in_heap(oop new_value, T* addr, oop compare_value);
  
      template <typename T>
      static oop oop_atomic_xchg_not_in_heap(T* addr, oop new_value);
  
    };
--- 182,192 ----
      // Used for catching bad stores
      template <typename T>
      static void oop_store_not_in_heap(T* addr, oop value);
  
      template <typename T>
!     static oop oop_atomic_cmpxchg_not_in_heap(T* addr, oop compare_value, oop new_value);
  
      template <typename T>
      static oop oop_atomic_xchg_not_in_heap(T* addr, oop new_value);
  
    };