--- a/src/hotspot/share/oops/cpCache.inline.hpp	Mon Nov 25 14:06:13 2019 +0100
+++ b/src/hotspot/share/oops/cpCache.inline.hpp	Mon Nov 25 12:22:13 2019 +0100
@@ -29,7 +29,7 @@
 #include "oops/oopHandle.inline.hpp"
 #include "runtime/orderAccess.hpp"
 
-inline int ConstantPoolCacheEntry::indices_ord() const { return OrderAccess::load_acquire(&_indices); }
+inline int ConstantPoolCacheEntry::indices_ord() const { return Atomic::load_acquire(&_indices); }
 
 inline Bytecodes::Code ConstantPoolCacheEntry::bytecode_1() const {
   return Bytecodes::cast((indices_ord() >> bytecode_1_shift) & bytecode_1_mask);
@@ -53,7 +53,7 @@
   return (Method*)_f2;
 }
 
-inline Metadata* ConstantPoolCacheEntry::f1_ord() const { return (Metadata *)OrderAccess::load_acquire(&_f1); }
+inline Metadata* ConstantPoolCacheEntry::f1_ord() const { return (Metadata *)Atomic::load_acquire(&_f1); }
 
 inline Method* ConstantPoolCacheEntry::f1_as_method() const {
   Metadata* f1 = f1_ord(); assert(f1 == NULL || f1->is_method(), "");
@@ -75,7 +75,7 @@
   return (!is_f1_null()) && (_flags & (1 << has_local_signature_shift)) != 0;
 }
 
-inline intx ConstantPoolCacheEntry::flags_ord() const   { return (intx)OrderAccess::load_acquire(&_flags); }
+inline intx ConstantPoolCacheEntry::flags_ord() const   { return (intx)Atomic::load_acquire(&_flags); }
 
 inline bool ConstantPoolCacheEntry::indy_resolution_failed() const {
   intx flags = flags_ord();