src/hotspot/share/gc/shared/barrierSet.hpp

*** 209,225 ****
      static void store_in_heap_at(oop base, ptrdiff_t offset, T value) {
        Raw::store_at(base, offset, value);
      }
  
      template <typename T>
!     static T atomic_cmpxchg_in_heap(T new_value, T* addr, T compare_value) {
!       return Raw::atomic_cmpxchg(new_value, addr, compare_value);
      }
  
      template <typename T>
!     static T atomic_cmpxchg_in_heap_at(T new_value, oop base, ptrdiff_t offset, T compare_value) {
!       return Raw::atomic_cmpxchg_at(new_value, base, offset, compare_value);
      }
  
      template <typename T>
      static T atomic_xchg_in_heap(T* addr, T new_value) {
        return Raw::atomic_xchg(addr, new_value);
--- 209,225 ----
      static void store_in_heap_at(oop base, ptrdiff_t offset, T value) {
        Raw::store_at(base, offset, value);
      }
  
      template <typename T>
!     static T atomic_cmpxchg_in_heap(T* addr, T compare_value, T new_value) {
!       return Raw::atomic_cmpxchg(addr, compare_value, new_value);
      }
  
      template <typename T>
!     static T atomic_cmpxchg_in_heap_at(oop base, ptrdiff_t offset, T compare_value, T new_value) {
!       return Raw::atomic_cmpxchg_at(base, offset, compare_value, new_value);
      }
  
      template <typename T>
      static T atomic_xchg_in_heap(T* addr, T new_value) {
        return Raw::atomic_xchg(addr, new_value);
*** 259,274 ****
      static void oop_store_in_heap_at(oop base, ptrdiff_t offset, oop value) {
        Raw::oop_store_at(base, offset, value);
      }
  
      template <typename T>
!     static oop oop_atomic_cmpxchg_in_heap(oop new_value, T* addr, oop compare_value) {
!       return Raw::oop_atomic_cmpxchg(new_value, addr, compare_value);
      }
  
!     static oop oop_atomic_cmpxchg_in_heap_at(oop new_value, oop base, ptrdiff_t offset, oop compare_value) {
!       return Raw::oop_atomic_cmpxchg_at(new_value, base, offset, compare_value);
      }
  
      template <typename T>
      static oop oop_atomic_xchg_in_heap(T* addr, oop new_value) {
        return Raw::oop_atomic_xchg(addr, new_value);
--- 259,274 ----
      static void oop_store_in_heap_at(oop base, ptrdiff_t offset, oop value) {
        Raw::oop_store_at(base, offset, value);
      }
  
      template <typename T>
!     static oop oop_atomic_cmpxchg_in_heap(T* addr, oop compare_value, oop new_value) {
!       return Raw::oop_atomic_cmpxchg(addr, compare_value, new_value);
      }
  
!     static oop oop_atomic_cmpxchg_in_heap_at(oop base, ptrdiff_t offset, oop compare_value, oop new_value) {
!       return Raw::oop_atomic_cmpxchg_at(base, offset, compare_value, new_value);
      }
  
      template <typename T>
      static oop oop_atomic_xchg_in_heap(T* addr, oop new_value) {
        return Raw::oop_atomic_xchg(addr, new_value);
*** 295,306 ****
      static void oop_store_not_in_heap(T* addr, oop value) {
        Raw::oop_store(addr, value);
      }
  
      template <typename T>
!     static oop oop_atomic_cmpxchg_not_in_heap(oop new_value, T* addr, oop compare_value) {
!       return Raw::oop_atomic_cmpxchg(new_value, addr, compare_value);
      }
  
      template <typename T>
      static oop oop_atomic_xchg_not_in_heap(T* addr, oop new_value) {
        return Raw::oop_atomic_xchg(addr, new_value);
--- 295,306 ----
      static void oop_store_not_in_heap(T* addr, oop value) {
        Raw::oop_store(addr, value);
      }
  
      template <typename T>
!     static oop oop_atomic_cmpxchg_not_in_heap(T* addr, oop compare_value, oop new_value) {
!       return Raw::oop_atomic_cmpxchg(addr, compare_value, new_value);
      }
  
      template <typename T>
      static oop oop_atomic_xchg_not_in_heap(T* addr, oop new_value) {
        return Raw::oop_atomic_xchg(addr, new_value);