--- old/src/hotspot/share/runtime/atomic.hpp	2017-10-12 12:06:19.844797456 -0400
+++ new/src/hotspot/share/runtime/atomic.hpp	2017-10-12 12:06:19.354405082 -0400
@@ -127,7 +127,7 @@
   // often used as part of lazy initialization, as a lock-free
   // alternative to the Double-Checked Locking Pattern.
   template<typename T, typename D>
-  inline static bool cmpxchg_if_null(T* value, D* volatile* dest,
+  inline static bool replace_if_null(T* value, D* volatile* dest,
                                      cmpxchg_memory_order order = memory_order_conservative);
 
 private:
@@ -681,7 +681,7 @@
 }
 
 template<typename T, typename D>
-inline bool Atomic::cmpxchg_if_null(T* value, D* volatile* dest,
+inline bool Atomic::replace_if_null(T* value, D* volatile* dest,
                                     cmpxchg_memory_order order) {
   // Presently using a trivial implementation in terms of cmpxchg.
   // Consider adding platform support, to permit the use of compiler