--- a/src/hotspot/share/prims/jni.cpp	Mon Nov 25 14:06:13 2019 +0100
+++ b/src/hotspot/share/prims/jni.cpp	Mon Nov 25 12:22:13 2019 +0100
@@ -274,7 +274,7 @@
     uintx count = 0;
 
     while (Atomic::cmpxchg(1, &JNIHistogram_lock, 0) != 0) {
-      while (OrderAccess::load_acquire(&JNIHistogram_lock) != 0) {
+      while (Atomic::load_acquire(&JNIHistogram_lock) != 0) {
         count +=1;
         if ( (WarnOnStalledSpinLock > 0)
           && (count % WarnOnStalledSpinLock == 0)) {
@@ -3916,7 +3916,7 @@
     *(JNIEnv**)penv = 0;
     // reset vm_created last to avoid race condition. Use OrderAccess to
     // control both compiler and architectural-based reordering.
-    OrderAccess::release_store(&vm_created, 0);
+    Atomic::release_store(&vm_created, 0);
   }
 
   // Flush stdout and stderr before exit.