--- a/test/hotspot/gtest/gc/g1/test_g1FreeIdSet.cpp	Mon Nov 25 14:06:13 2019 +0100
+++ b/test/hotspot/gtest/gc/g1/test_g1FreeIdSet.cpp	Mon Nov 25 12:22:13 2019 +0100
@@ -27,7 +27,6 @@
 #include "memory/allocation.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/semaphore.inline.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/debug.hpp"
@@ -108,7 +107,7 @@
   {}
 
   virtual void main_run() {
-    while (OrderAccess::load_acquire(_continue_running)) {
+    while (Atomic::load_acquire(_continue_running)) {
       uint id = _set->claim_par_id();
       _set->release_par_id(id);
       ++_allocations;
@@ -147,7 +146,7 @@
     ThreadInVMfromNative invm(this_thread);
     this_thread->sleep(milliseconds_to_run);
   }
-  OrderAccess::release_store(&continue_running, false);
+  Atomic::release_store(&continue_running, false);
   for (uint i = 0; i < nthreads; ++i) {
     ThreadInVMfromNative invm(this_thread);
     post.wait_with_safepoint_check(this_thread);