--- old/src/hotspot/share/utilities/hashtable.cpp	2017-10-10 17:37:39.914505098 -0400
+++ new/src/hotspot/share/utilities/hashtable.cpp	2017-10-10 17:37:39.456048665 -0400
@@ -190,7 +190,7 @@
   BasicHashtableEntry<F>* current = _free_list;
   while (true) {
     context->_removed_tail->set_next(current);
-    BasicHashtableEntry<F>* old = (BasicHashtableEntry<F>*)Atomic::cmpxchg_ptr(context->_removed_head, &_free_list, current);
+    BasicHashtableEntry<F>* old = Atomic::cmpxchg(context->_removed_head, &_free_list, current);
     if (old == current) {
       break;
     }