diff -r 4cbfa5077d68 -r 623722a6aeb9 src/hotspot/share/gc/z/zBarrierSet.hpp
--- a/src/hotspot/share/gc/z/zBarrierSet.hpp	Mon Nov 25 12:32:40 2019 +0100
+++ b/src/hotspot/share/gc/z/zBarrierSet.hpp	Mon Nov 25 12:33:15 2019 +0100
@@ -70,8 +70,8 @@
     static oop oop_load_in_heap_at(oop base, ptrdiff_t offset);
 
     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);
+    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);
@@ -91,7 +91,7 @@
     static oop oop_load_not_in_heap(T* addr);
 
     template <typename T>
-    static oop oop_atomic_cmpxchg_not_in_heap(oop new_value, T* addr, oop compare_value);
+    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);