--- a/src/hotspot/share/memory/universe.cpp	Mon Oct 16 20:22:41 2017 +0000
+++ b/src/hotspot/share/memory/universe.cpp	Mon Oct 16 22:36:06 2017 -0400
@@ -537,7 +537,7 @@
 
 oop Universe::swap_reference_pending_list(oop list) {
   assert_pll_locked(is_locked);
-  return (oop)Atomic::xchg_ptr(list, &_reference_pending_list);
+  return Atomic::xchg(list, &_reference_pending_list);
 }
 
 #undef assert_pll_locked