--- a/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp	Mon Nov 25 14:06:13 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp	Mon Nov 25 12:22:13 2019 +0100
@@ -47,19 +47,19 @@
   }
 
   void set() {
-    OrderAccess::release_store_fence(&value, (ShenandoahSharedValue)SET);
+    Atomic::release_store_fence(&value, (ShenandoahSharedValue)SET);
   }
 
   void unset() {
-    OrderAccess::release_store_fence(&value, (ShenandoahSharedValue)UNSET);
+    Atomic::release_store_fence(&value, (ShenandoahSharedValue)UNSET);
   }
 
   bool is_set() const {
-    return OrderAccess::load_acquire(&value) == SET;
+    return Atomic::load_acquire(&value) == SET;
   }
 
   bool is_unset() const {
-    return OrderAccess::load_acquire(&value) == UNSET;
+    return Atomic::load_acquire(&value) == UNSET;
   }
 
   void set_cond(bool val) {
@@ -118,7 +118,7 @@
     assert (mask < (sizeof(ShenandoahSharedValue) * CHAR_MAX), "sanity");
     ShenandoahSharedValue mask_val = (ShenandoahSharedValue) mask;
     while (true) {
-      ShenandoahSharedValue ov = OrderAccess::load_acquire(&value);
+      ShenandoahSharedValue ov = Atomic::load_acquire(&value);
       if ((ov & mask_val) != 0) {
         // already set
         return;
@@ -136,7 +136,7 @@
     assert (mask < (sizeof(ShenandoahSharedValue) * CHAR_MAX), "sanity");
     ShenandoahSharedValue mask_val = (ShenandoahSharedValue) mask;
     while (true) {
-      ShenandoahSharedValue ov = OrderAccess::load_acquire(&value);
+      ShenandoahSharedValue ov = Atomic::load_acquire(&value);
       if ((ov & mask_val) == 0) {
         // already unset
         return;
@@ -151,7 +151,7 @@
   }
 
   void clear() {
-    OrderAccess::release_store_fence(&value, (ShenandoahSharedValue)0);
+    Atomic::release_store_fence(&value, (ShenandoahSharedValue)0);
   }
 
   bool is_set(uint mask) const {
@@ -160,11 +160,11 @@
 
   bool is_unset(uint mask) const {
     assert (mask < (sizeof(ShenandoahSharedValue) * CHAR_MAX), "sanity");
-    return (OrderAccess::load_acquire(&value) & (ShenandoahSharedValue) mask) == 0;
+    return (Atomic::load_acquire(&value) & (ShenandoahSharedValue) mask) == 0;
   }
 
   bool is_clear() const {
-    return (OrderAccess::load_acquire(&value)) == 0;
+    return (Atomic::load_acquire(&value)) == 0;
   }
 
   void set_cond(uint mask, bool val) {
@@ -211,11 +211,11 @@
   void set(T v) {
     assert (v >= 0, "sanity");
     assert (v < (sizeof(ShenandoahSharedValue) * CHAR_MAX), "sanity");
-    OrderAccess::release_store_fence(&value, (ShenandoahSharedValue)v);
+    Atomic::release_store_fence(&value, (ShenandoahSharedValue)v);
   }
 
   T get() const {
-    return (T)OrderAccess::load_acquire(&value);
+    return (T)Atomic::load_acquire(&value);
   }
 
   T cmpxchg(T new_value, T expected) {