--- a/src/hotspot/share/gc/shared/concurrentGCThread.cpp	Mon Nov 25 14:06:13 2019 +0100
+++ b/src/hotspot/share/gc/shared/concurrentGCThread.cpp	Mon Nov 25 12:22:13 2019 +0100
@@ -51,7 +51,7 @@
 
   // Signal thread has terminated
   MonitorLocker ml(Terminator_lock);
-  OrderAccess::release_store(&_has_terminated, true);
+  Atomic::release_store(&_has_terminated, true);
   ml.notify_all();
 }
 
@@ -60,7 +60,7 @@
   assert(!has_terminated(), "Invalid state");
 
   // Signal thread to terminate
-  OrderAccess::release_store_fence(&_should_terminate, true);
+  Atomic::release_store_fence(&_should_terminate, true);
 
   stop_service();
 
@@ -72,9 +72,9 @@
 }
 
 bool ConcurrentGCThread::should_terminate() const {
-  return OrderAccess::load_acquire(&_should_terminate);
+  return Atomic::load_acquire(&_should_terminate);
 }
 
 bool ConcurrentGCThread::has_terminated() const {
-  return OrderAccess::load_acquire(&_has_terminated);
+  return Atomic::load_acquire(&_has_terminated);
 }