--- a/src/hotspot/share/oops/array.hpp	Mon Nov 25 14:06:13 2019 +0100
+++ b/src/hotspot/share/oops/array.hpp	Mon Nov 25 12:22:13 2019 +0100
@@ -27,7 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "memory/metaspace.hpp"
-#include "runtime/orderAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/align.hpp"
 
 // Array for metadata allocation
@@ -122,8 +122,8 @@
   T*   adr_at(const int i)             { assert(i >= 0 && i< _length, "oob: 0 <= %d < %d", i, _length); return &_data[i]; }
   int  find(const T& x)                { return index_of(x); }
 
-  T at_acquire(const int i)            { return OrderAccess::load_acquire(adr_at(i)); }
-  void release_at_put(int i, T x)      { OrderAccess::release_store(adr_at(i), x); }
+  T at_acquire(const int i)            { return Atomic::load_acquire(adr_at(i)); }
+  void release_at_put(int i, T x)      { Atomic::release_store(adr_at(i), x); }
 
   static int size(int length) {
     size_t bytes = align_up(byte_sizeof(length), BytesPerWord);