--- a/src/hotspot/share/oops/constantPool.inline.hpp	Mon Nov 25 14:06:13 2019 +0100
+++ b/src/hotspot/share/oops/constantPool.inline.hpp	Mon Nov 25 12:22:13 2019 +0100
@@ -33,7 +33,7 @@
   assert(is_within_bounds(which), "index out of bounds");
   assert(!tag_at(which).is_unresolved_klass() && !tag_at(which).is_unresolved_klass_in_error(), "Corrupted constant pool");
   // Uses volatile because the klass slot changes without a lock.
-  intptr_t adr = OrderAccess::load_acquire(obj_at_addr(which));
+  intptr_t adr = Atomic::load_acquire(obj_at_addr(which));
   assert(adr != 0 || which == 0, "cp entry for klass should not be zero");
   return CPSlot(adr);
 }
@@ -46,7 +46,7 @@
   assert(tag_at(kslot.name_index()).is_symbol(), "sanity");
 
   Klass** adr = resolved_klasses()->adr_at(kslot.resolved_klass_index());
-  return OrderAccess::load_acquire(adr);
+  return Atomic::load_acquire(adr);
 }
 
 inline bool ConstantPool::is_pseudo_string_at(int which) {