--- old/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp	2019-11-21 11:17:23.163778415 +0100
+++ new/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp	2019-11-21 11:17:22.755771865 +0100
@@ -27,7 +27,7 @@
 
 #include "jfr/utilities/jfrTypes.hpp"
 #include "memory/allocation.hpp"
-#include "runtime/orderAccess.hpp"
+#include "runtime/atomic.hpp"
 
 #define USED_BIT                             1
 #define METHOD_USED_BIT                      (USED_BIT << 2)
@@ -91,16 +91,16 @@
   }
 
   static bool has_changed_tag_state() {
-    if (OrderAccess::load_acquire(&_tag_state)) {
-      OrderAccess::release_store(&_tag_state, false);
+    if (Atomic::load_acquire(&_tag_state)) {
+      Atomic::release_store(&_tag_state, false);
       return true;
     }
     return false;
   }
 
   static void set_changed_tag_state() {
-    if (!OrderAccess::load_acquire(&_tag_state)) {
-      OrderAccess::release_store(&_tag_state, true);
+    if (!Atomic::load_acquire(&_tag_state)) {
+      Atomic::release_store(&_tag_state, true);
     }
   }
 };