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

*** 77,87 ****
  
    public:
      template <typename T>
      static void oop_store_in_heap(T* addr, oop value);
      template <typename T>
!     static oop oop_atomic_cmpxchg_in_heap(oop new_value, T* addr, oop compare_value);
      template <typename T>
      static oop oop_atomic_xchg_in_heap(T* addr, oop new_value);
  
      template <typename T>
      static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
--- 77,87 ----
  
    public:
      template <typename T>
      static void oop_store_in_heap(T* addr, oop value);
      template <typename T>
!     static oop oop_atomic_cmpxchg_in_heap(T* addr, oop compare_value, oop new_value);
      template <typename T>
      static oop oop_atomic_xchg_in_heap(T* addr, oop new_value);
  
      template <typename T>
      static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
*** 96,107 ****
  
      static oop oop_atomic_xchg_in_heap_at(oop base, ptrdiff_t offset, oop new_value) {
        return oop_atomic_xchg_in_heap(AccessInternal::oop_field_addr<decorators>(base, offset), new_value);
      }
  
!     static oop oop_atomic_cmpxchg_in_heap_at(oop new_value, oop base, ptrdiff_t offset, oop compare_value) {
!       return oop_atomic_cmpxchg_in_heap(new_value, AccessInternal::oop_field_addr<decorators>(base, offset), compare_value);
      }
    };
  };
  
  template<>
--- 96,107 ----
  
      static oop oop_atomic_xchg_in_heap_at(oop base, ptrdiff_t offset, oop new_value) {
        return oop_atomic_xchg_in_heap(AccessInternal::oop_field_addr<decorators>(base, offset), new_value);
      }
  
!     static oop oop_atomic_cmpxchg_in_heap_at(oop base, ptrdiff_t offset, oop compare_value, oop new_value) {
!       return oop_atomic_cmpxchg_in_heap(AccessInternal::oop_field_addr<decorators>(base, offset), compare_value, new_value);
      }
    };
  };
  
  template<>