--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp	Mon Sep 16 11:11:46 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp	Mon Sep 16 11:18:50 2019 +0200
@@ -44,7 +44,7 @@
   traceid compare_value;
   traceid exchange_value;
   do {
-    compare_value = Atomic::load(dest);
+    compare_value = *dest;
     exchange_value = compare_value + 1;
   } while (Atomic::cmpxchg(exchange_value, dest, compare_value) != compare_value);
   return exchange_value;

--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp	Mon Sep 16 11:11:46 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp	Mon Sep 16 11:18:50 2019 +0200
@@ -59,7 +59,7 @@
 // set data iff *dest == NULL
 static bool try_set(void* const data, void** dest, bool clear) {
   assert(data != NULL, "invariant");
-  const void* const current = Atomic::load(dest);
+  const void* const current = *dest;
   if (current != NULL) {
     if (current != data) {
       // already set

--- a/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.cpp	Mon Sep 16 11:11:46 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.cpp	Mon Sep 16 11:18:50 2019 +0200
@@ -32,7 +32,7 @@
   size_t compare_value;
   size_t exchange_value;
   do {
-    compare_value = Atomic::load(dest);
+    compare_value = *dest;
     exchange_value = compare_value + value;
   } while (Atomic::cmpxchg(exchange_value, dest, compare_value) != compare_value);
   return exchange_value;
@@ -42,7 +42,7 @@
   size_t compare_value;
   size_t exchange_value;
   do {
-    compare_value = Atomic::load(dest);
+    compare_value = *dest;
     assert(compare_value >= 1, "invariant");
     exchange_value = compare_value - 1;
   } while (Atomic::cmpxchg(exchange_value, dest, compare_value) != compare_value);

--- a/src/hotspot/share/jfr/utilities/jfrAllocation.cpp	Mon Sep 16 11:11:46 2019 +0200
+++ b/src/hotspot/share/jfr/utilities/jfrAllocation.cpp	Mon Sep 16 11:18:50 2019 +0200
@@ -39,7 +39,7 @@
   jlong compare_value;
   jlong exchange_value;
   do {
-    compare_value = Atomic::load(dest);
+    compare_value = *dest;
     exchange_value = compare_value + value;
   } while (Atomic::cmpxchg(exchange_value, dest, compare_value) != compare_value);
   return exchange_value;