--- a/src/hotspot/share/gc/shared/barrierSet.hpp	Thu Jul 05 09:11:33 2018 -0700
+++ b/src/hotspot/share/gc/shared/barrierSet.hpp	Thu Jul 05 19:22:38 2018 +0200
@@ -199,7 +199,7 @@
 
     template <typename T>
     static T atomic_cmpxchg_in_heap_at(T new_value, oop base, ptrdiff_t offset, T compare_value) {
-      return Raw::oop_atomic_cmpxchg_at(new_value, base, offset, compare_value);
+      return Raw::atomic_cmpxchg_at(new_value, base, offset, compare_value);
     }
 
     template <typename T>