--- a/src/hotspot/share/oops/method.inline.hpp	Mon Nov 25 14:06:13 2019 +0100
+++ b/src/hotspot/share/oops/method.inline.hpp	Mon Nov 25 12:22:13 2019 +0100
@@ -29,23 +29,23 @@
 #include "runtime/orderAccess.hpp"
 
 inline address Method::from_compiled_entry() const {
-  return OrderAccess::load_acquire(&_from_compiled_entry);
+  return Atomic::load_acquire(&_from_compiled_entry);
 }
 
 inline address Method::from_interpreted_entry() const {
-  return OrderAccess::load_acquire(&_from_interpreted_entry);
+  return Atomic::load_acquire(&_from_interpreted_entry);
 }
 
 inline void Method::set_method_data(MethodData* data) {
   // The store into method must be released. On platforms without
   // total store order (TSO) the reference may become visible before
   // the initialization of data otherwise.
-  OrderAccess::release_store(&_method_data, data);
+  Atomic::release_store(&_method_data, data);
 }
 
 inline CompiledMethod* volatile Method::code() const {
   assert( check_code(), "" );
-  return OrderAccess::load_acquire(&_code);
+  return Atomic::load_acquire(&_code);
 }
 
 // Write (bci, line number) pair to stream