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

*** 140,153 ****
    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(oop new_value, T* addr);
  
    public:
      // Heap oop accesses. These accessors get resolved when
      // IN_HEAP is set (e.g. when using the HeapAccess API), it is
      // an oop_* overload, and the barrier strength is AS_NORMAL.
--- 140,153 ----
    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:
      // Heap oop accesses. These accessors get resolved when
      // IN_HEAP is set (e.g. when using the HeapAccess API), it is
      // an oop_* overload, and the barrier strength is AS_NORMAL.
*** 158,173 ****
      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(oop new_value, T* addr);
!     static oop oop_atomic_xchg_in_heap_at(oop new_value, oop base, ptrdiff_t offset);
  
      template <typename T>
      static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
                                        arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
                                        size_t length);
--- 158,173 ----
      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);
  
      template <typename T>
      static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
                                        arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
                                        size_t length);
*** 182,195 ****
      // 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(oop new_value, T* addr);
  
    };
  
  };
  
--- 182,195 ----
      // 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);
  
    };
  
  };