changeset 57121:97d13893ec3c

8234748: Clean up atomic and orderAccess includes Reviewed-by: dholmes
author stefank
date Tue, 26 Nov 2019 10:47:46 +0100
parents c887851da33d
children 54cf02d52c1b
files src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp src/hotspot/cpu/arm/nativeInst_arm_32.hpp src/hotspot/cpu/arm/relocInfo_arm.cpp src/hotspot/cpu/x86/rdtsc_x86.cpp src/hotspot/cpu/zero/cppInterpreter_zero.cpp src/hotspot/os/aix/os_aix.cpp src/hotspot/os/linux/os_linux.cpp src/hotspot/os/posix/os_posix.cpp src/hotspot/os/windows/osThread_windows.cpp src/hotspot/share/aot/aotCodeHeap.cpp src/hotspot/share/aot/aotCompiledMethod.cpp src/hotspot/share/asm/assembler.cpp src/hotspot/share/classfile/classLoader.inline.hpp src/hotspot/share/classfile/classLoaderData.cpp src/hotspot/share/classfile/classLoaderDataGraph.cpp src/hotspot/share/classfile/dictionary.cpp src/hotspot/share/classfile/systemDictionary.cpp src/hotspot/share/classfile/verifier.cpp src/hotspot/share/code/codeCache.cpp src/hotspot/share/code/compiledMethod.cpp src/hotspot/share/code/compiledMethod.inline.hpp src/hotspot/share/code/dependencyContext.cpp src/hotspot/share/compiler/compileBroker.hpp src/hotspot/share/gc/epsilon/epsilonHeap.cpp src/hotspot/share/gc/g1/g1BarrierSet.cpp src/hotspot/share/gc/g1/g1CardTable.cpp src/hotspot/share/gc/g1/g1CodeCacheRemSet.cpp src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp src/hotspot/share/gc/g1/g1CollectionSet.cpp src/hotspot/share/gc/g1/g1ConcurrentMark.cpp src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp src/hotspot/share/gc/g1/g1ParallelCleaning.cpp src/hotspot/share/gc/g1/g1RemSet.cpp src/hotspot/share/gc/g1/g1StringDedup.cpp src/hotspot/share/gc/g1/heapRegion.cpp src/hotspot/share/gc/g1/heapRegionManager.cpp src/hotspot/share/gc/g1/heapRegionRemSet.hpp src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp src/hotspot/share/gc/g1/sparsePRT.cpp src/hotspot/share/gc/parallel/psCompactionManager.cpp src/hotspot/share/gc/parallel/psParallelCompact.hpp src/hotspot/share/gc/serial/defNewGeneration.cpp src/hotspot/share/gc/shared/concurrentGCThread.cpp src/hotspot/share/gc/shared/parallelCleaning.cpp src/hotspot/share/gc/shared/preservedMarks.cpp src/hotspot/share/gc/shared/ptrQueue.cpp src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp src/hotspot/share/gc/shared/satbMarkQueue.cpp src/hotspot/share/gc/shared/space.cpp src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp src/hotspot/share/gc/shared/stringdedup/stringDedupThread.cpp src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.cpp src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp src/hotspot/share/gc/z/zLiveMap.cpp src/hotspot/share/gc/z/zMark.cpp src/hotspot/share/gc/z/zMarkTerminate.inline.hpp src/hotspot/share/gc/z/zNMethod.cpp src/hotspot/share/gc/z/zNMethodData.cpp src/hotspot/share/gc/z/zNMethodTable.cpp src/hotspot/share/gc/z/zReferenceProcessor.cpp src/hotspot/share/interpreter/oopMapCache.cpp src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp src/hotspot/share/jfr/utilities/jfrHashtable.hpp src/hotspot/share/jvmci/jvmciCompiler.hpp src/hotspot/share/jvmci/jvmciCompilerToVM.cpp src/hotspot/share/jvmci/jvmciRuntime.cpp src/hotspot/share/jvmci/metadataHandleBlock.cpp src/hotspot/share/logging/logDecorations.cpp src/hotspot/share/memory/allocation.cpp src/hotspot/share/memory/arena.cpp src/hotspot/share/memory/metaspace.cpp src/hotspot/share/memory/metaspace/virtualSpaceList.cpp src/hotspot/share/oops/accessBackend.inline.hpp src/hotspot/share/oops/arrayKlass.inline.hpp src/hotspot/share/oops/constantPool.inline.hpp src/hotspot/share/oops/cpCache.cpp src/hotspot/share/oops/cpCache.inline.hpp src/hotspot/share/oops/instanceKlass.inline.hpp src/hotspot/share/oops/klass.cpp src/hotspot/share/oops/method.cpp src/hotspot/share/oops/method.inline.hpp src/hotspot/share/oops/methodData.inline.hpp src/hotspot/share/oops/oop.inline.hpp src/hotspot/share/prims/jni.cpp src/hotspot/share/prims/jvm.cpp src/hotspot/share/prims/jvmtiEnvBase.hpp src/hotspot/share/prims/jvmtiImpl.cpp src/hotspot/share/prims/resolvedMethodTable.cpp src/hotspot/share/prims/unsafe.cpp src/hotspot/share/prims/whitebox.cpp src/hotspot/share/runtime/deoptimization.cpp src/hotspot/share/runtime/handshake.cpp src/hotspot/share/runtime/init.cpp src/hotspot/share/runtime/interfaceSupport.cpp src/hotspot/share/runtime/perfMemory.cpp src/hotspot/share/runtime/safepointMechanism.cpp src/hotspot/share/runtime/sweeper.cpp src/hotspot/share/runtime/threadHeapSampler.cpp src/hotspot/share/runtime/threadSMR.cpp src/hotspot/share/runtime/vmThread.cpp src/hotspot/share/services/lowMemoryDetector.hpp src/hotspot/share/services/mallocSiteTable.hpp src/hotspot/share/services/mallocTracker.cpp src/hotspot/share/services/memTracker.cpp src/hotspot/share/services/memoryManager.cpp src/hotspot/share/services/memoryPool.cpp src/hotspot/share/services/threadIdTable.cpp src/hotspot/share/services/threadStackTracker.cpp src/hotspot/share/services/virtualMemoryTracker.cpp src/hotspot/share/utilities/bitMap.inline.hpp src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp src/hotspot/share/utilities/globalCounter.cpp src/hotspot/share/utilities/globalCounter.inline.hpp src/hotspot/share/utilities/hashtable.inline.hpp
diffstat 127 files changed, 88 insertions(+), 79 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -30,6 +30,7 @@
 #include "nativeInst_aarch64.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "utilities/ostream.hpp"
--- a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -28,6 +28,7 @@
 #include "asm/macroAssembler.hpp"
 #include "code/codeCache.hpp"
 #include "runtime/icache.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/thread.hpp"
 #include "register_arm.hpp"
--- a/src/hotspot/cpu/arm/relocInfo_arm.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/cpu/arm/relocInfo_arm.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -29,7 +29,6 @@
 #include "nativeInst_arm.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/safepoint.hpp"
 
 void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
--- a/src/hotspot/cpu/x86/rdtsc_x86.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/cpu/x86/rdtsc_x86.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "rdtsc_x86.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/thread.inline.hpp"
 #include "vm_version_ext_x86.hpp"
 
--- a/src/hotspot/cpu/zero/cppInterpreter_zero.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/cpu/zero/cppInterpreter_zero.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -38,13 +38,11 @@
 #include "prims/jvmtiExport.hpp"
 #include "prims/jvmtiThreadState.hpp"
 #include "runtime/arguments.hpp"
-#include "runtime/atomic.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/synchronizer.hpp"
--- a/src/hotspot/os/aix/os_aix.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/os/aix/os_aix.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -60,7 +60,6 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/objectMonitor.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/perfMemory.hpp"
--- a/src/hotspot/os/linux/os_linux.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/os/linux/os_linux.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -53,7 +53,6 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/objectMonitor.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/perfMemory.hpp"
 #include "runtime/sharedRuntime.hpp"
--- a/src/hotspot/os/posix/os_posix.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/os/posix/os_posix.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -30,6 +30,7 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "services/memTracker.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/align.hpp"
 #include "utilities/events.hpp"
 #include "utilities/formatBuffer.hpp"
--- a/src/hotspot/os/windows/osThread_windows.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/os/windows/osThread_windows.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -23,7 +23,6 @@
  */
 
 // no precompiled headers
-#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/osThread.hpp"
 
--- a/src/hotspot/share/aot/aotCodeHeap.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/aot/aotCodeHeap.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -40,6 +40,7 @@
 #include "oops/compressedOops.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/method.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/os.hpp"
--- a/src/hotspot/share/aot/aotCompiledMethod.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/aot/aotCompiledMethod.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -37,6 +37,7 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/java.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/sharedRuntime.hpp"
--- a/src/hotspot/share/asm/assembler.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/asm/assembler.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -29,7 +29,6 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"
-#include "runtime/atomic.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
 #include "runtime/thread.hpp"
--- a/src/hotspot/share/classfile/classLoader.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/classfile/classLoader.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -26,7 +26,7 @@
 #define SHARE_CLASSFILE_CLASSLOADER_INLINE_HPP
 
 #include "classfile/classLoader.hpp"
-#include "runtime/orderAccess.hpp"
+#include "runtime/atomic.hpp"
 
 // Next entry in class path
 inline ClassPathEntry* ClassPathEntry::next() const { return Atomic::load_acquire(&_next); }
--- a/src/hotspot/share/classfile/classLoaderData.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/classfile/classLoaderData.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -67,7 +67,6 @@
 #include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/mutex.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/safepoint.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/macros.hpp"
--- a/src/hotspot/share/classfile/classLoaderDataGraph.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -38,7 +38,6 @@
 #include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/mutex.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "utilities/growableArray.hpp"
--- a/src/hotspot/share/classfile/dictionary.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/classfile/dictionary.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -33,8 +33,6 @@
 #include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "utilities/hashtable.inline.hpp"
--- a/src/hotspot/share/classfile/systemDictionary.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/classfile/systemDictionary.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -79,7 +79,6 @@
 #include "runtime/java.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
 #include "services/classLoadingService.hpp"
--- a/src/hotspot/share/classfile/verifier.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/classfile/verifier.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -50,7 +50,6 @@
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/jniHandles.inline.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/thread.hpp"
--- a/src/hotspot/share/code/codeCache.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/code/codeCache.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -47,6 +47,7 @@
 #include "oops/oop.inline.hpp"
 #include "oops/verifyOopClosure.hpp"
 #include "runtime/arguments.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/icache.hpp"
--- a/src/hotspot/share/code/compiledMethod.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/code/compiledMethod.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -38,6 +38,7 @@
 #include "oops/methodData.hpp"
 #include "oops/method.inline.hpp"
 #include "prims/methodHandles.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/mutexLocker.hpp"
--- a/src/hotspot/share/code/compiledMethod.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/code/compiledMethod.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -27,8 +27,8 @@
 
 #include "code/compiledMethod.hpp"
 #include "code/nativeInst.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/frame.hpp"
-#include "runtime/orderAccess.hpp"
 
 inline bool CompiledMethod::is_deopt_pc(address pc) { return is_deopt_entry(pc) || is_deopt_mh_entry(pc); }
 
--- a/src/hotspot/share/code/dependencyContext.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/code/dependencyContext.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -28,6 +28,7 @@
 #include "code/dependencyContext.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/atomic.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/perfData.hpp"
 #include "utilities/exceptions.hpp"
 
--- a/src/hotspot/share/compiler/compileBroker.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/compiler/compileBroker.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -29,6 +29,7 @@
 #include "compiler/abstractCompiler.hpp"
 #include "compiler/compileTask.hpp"
 #include "compiler/compilerDirectives.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/perfData.hpp"
 #include "utilities/stack.hpp"
 #if INCLUDE_JVMCI
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -31,6 +31,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
 
 jint EpsilonHeap::initialize() {
--- a/src/hotspot/share/gc/g1/g1BarrierSet.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -37,6 +37,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/mutexLocker.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/thread.inline.hpp"
 #include "utilities/macros.hpp"
 #ifdef COMPILER1
--- a/src/hotspot/share/gc/g1/g1CardTable.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/g1CardTable.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -28,7 +28,6 @@
 #include "gc/shared/memset_with_concurrent_readers.hpp"
 #include "logging/log.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
 
 void G1CardTable::g1_mark_as_young(const MemRegion& mr) {
   CardValue *const first = byte_for(mr.start());
--- a/src/hotspot/share/gc/g1/g1CodeCacheRemSet.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/g1CodeCacheRemSet.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -32,6 +32,7 @@
 #include "memory/iterator.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/hashtable.inline.hpp"
 #include "utilities/stack.inline.hpp"
 
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -34,7 +34,6 @@
 #include "gc/g1/heapRegionRemSet.hpp"
 #include "gc/g1/heapRegionSet.inline.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
-#include "runtime/orderAccess.hpp"
 
 G1GCPhaseTimes* G1CollectedHeap::phase_times() const {
   return _policy->phase_times();
--- a/src/hotspot/share/gc/g1/g1CollectionSet.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/g1CollectionSet.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -33,6 +33,7 @@
 #include "gc/g1/heapRegionRemSet.hpp"
 #include "gc/g1/heapRegionSet.hpp"
 #include "logging/logStream.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/quickSort.hpp"
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -62,6 +62,7 @@
 #include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/java.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "services/memTracker.hpp"
 #include "utilities/align.hpp"
--- a/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -34,9 +34,9 @@
 #include "gc/g1/heapRegionRemSet.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/workgroup.hpp"
-#include "runtime/atomic.hpp"
 #include "runtime/flags/flagSetting.hpp"
 #include "runtime/mutexLocker.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/thread.inline.hpp"
--- a/src/hotspot/share/gc/g1/g1ParallelCleaning.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/g1ParallelCleaning.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 
 #include "gc/g1/g1ParallelCleaning.hpp"
+#include "runtime/atomic.hpp"
 #if INCLUDE_JVMCI
 #include "jvmci/jvmci.hpp"
 #endif
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -49,6 +49,7 @@
 #include "memory/resourceArea.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
--- a/src/hotspot/share/gc/g1/g1StringDedup.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/g1StringDedup.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -34,7 +34,6 @@
 #include "gc/shared/stringdedup/stringDedupTable.hpp"
 #include "gc/shared/stringdedup/stringDedupThread.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomic.hpp"
 
 void G1StringDedup::initialize() {
   assert(UseG1GC, "String deduplication available with G1");
@@ -88,4 +87,3 @@
     G1StringDedupQueue::push(worker_id, java_string);
   }
 }
-
--- a/src/hotspot/share/gc/g1/heapRegion.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/heapRegion.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -43,8 +43,6 @@
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
 
 int    HeapRegion::LogOfHRGrainBytes = 0;
 int    HeapRegion::LogOfHRGrainWords = 0;
--- a/src/hotspot/share/gc/g1/heapRegionManager.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/heapRegionManager.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -33,6 +33,8 @@
 #include "gc/g1/heterogeneousHeapRegionManager.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/bitMap.inline.hpp"
 
 class MasterFreeRegionListChecker : public HeapRegionSetChecker {
--- a/src/hotspot/share/gc/g1/heapRegionRemSet.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/heapRegionRemSet.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -28,6 +28,7 @@
 #include "gc/g1/g1CodeCacheRemSet.hpp"
 #include "gc/g1/g1FromCardCache.hpp"
 #include "gc/g1/sparsePRT.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/bitMap.hpp"
 
 // Remembered set for a heap region.  Represent a set of "cards" that
--- a/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -28,6 +28,7 @@
 #include "gc/g1/heapRegion.inline.hpp"
 #include "gc/g1/heapRegionRemSet.hpp"
 #include "gc/g1/sparsePRT.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/bitMap.inline.hpp"
 
 template <class Closure>
--- a/src/hotspot/share/gc/g1/sparsePRT.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/g1/sparsePRT.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -30,7 +30,6 @@
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/space.inline.hpp"
 #include "memory/allocation.inline.hpp"
-#include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
 
 // Check that the size of the SparsePRTEntry is evenly divisible by the maximum
--- a/src/hotspot/share/gc/parallel/psCompactionManager.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -39,7 +39,6 @@
 #include "oops/instanceMirrorKlass.inline.hpp"
 #include "oops/objArrayKlass.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomic.hpp"
 
 PSOldGen*            ParCompactionManager::_old_gen = NULL;
 ParCompactionManager**  ParCompactionManager::_manager_array = NULL;
--- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -32,6 +32,8 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/collectorCounters.hpp"
 #include "oops/oop.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/orderAccess.hpp"
 
 class ParallelScavengeHeap;
 class PSAdaptiveSizePolicy;
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -51,7 +51,6 @@
 #include "memory/resourceArea.hpp"
 #include "oops/instanceRefKlass.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomic.hpp"
 #include "runtime/java.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "runtime/thread.inline.hpp"
--- a/src/hotspot/share/gc/shared/concurrentGCThread.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shared/concurrentGCThread.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -24,9 +24,9 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/concurrentGCThread.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/init.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 
 ConcurrentGCThread::ConcurrentGCThread() :
--- a/src/hotspot/share/gc/shared/parallelCleaning.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shared/parallelCleaning.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -30,6 +30,7 @@
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
 #include "logging/log.hpp"
+#include "runtime/atomic.hpp"
 
 StringDedupCleaningTask::StringDedupCleaningTask(BoolObjectClosure* is_alive,
                                                  OopClosure* keep_alive,
--- a/src/hotspot/share/gc/shared/preservedMarks.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shared/preservedMarks.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -28,6 +28,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/macros.hpp"
 
 void PreservedMarks::restore() {
--- a/src/hotspot/share/gc/shared/ptrQueue.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shared/ptrQueue.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -30,7 +30,6 @@
 #include "runtime/atomic.hpp"
 #include "runtime/mutex.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/thread.inline.hpp"
 #include "utilities/globalCounter.inline.hpp"
 
--- a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -30,6 +30,7 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
+#include "runtime/atomic.hpp"
 
 #define ASSERT_REF_TYPE(ref_type) assert((ref_type) >= REF_SOFT && (ref_type) <= REF_PHANTOM, \
                                          "Invariant (%d)", (int)ref_type)
--- a/src/hotspot/share/gc/shared/satbMarkQueue.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shared/satbMarkQueue.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -30,7 +30,6 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/thread.hpp"
--- a/src/hotspot/share/gc/shared/space.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shared/space.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -37,7 +37,6 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/java.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "runtime/safepoint.hpp"
 #include "utilities/align.hpp"
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -35,6 +35,7 @@
 #include "oops/arrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/typeArrayOop.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/safepointVerifiers.hpp"
 
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -33,7 +33,6 @@
 #include "logging/log.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomic.hpp"
 
 StringDedupThread* StringDedupThread::_thread = NULL;
 
--- a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -28,6 +28,7 @@
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahTraversalGC.hpp"
 #include "oops/compressedOops.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/thread.hpp"
 
 ShenandoahForwardedIsAliveClosure::ShenandoahForwardedIsAliveClosure() :
--- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -29,6 +29,7 @@
 #include "gc/shenandoah/shenandoahUtils.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "runtime/atomic.hpp"
 
 ShenandoahParallelCodeCacheIterator::ShenandoahParallelCodeCacheIterator(const GrowableArray<CodeHeap*>* heaps) {
   _length = heaps->length();
--- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -37,6 +37,7 @@
 #include "gc/shenandoah/shenandoahWorkerPolicy.hpp"
 #include "memory/iterator.hpp"
 #include "memory/universe.hpp"
+#include "runtime/atomic.hpp"
 
 ShenandoahControlThread::ShenandoahControlThread() :
   ConcurrentGCThread(),
--- a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -27,7 +27,7 @@
 #include "gc/shenandoah/shenandoahUtils.hpp"
 #include "gc/shenandoah/shenandoahEvacOOMHandler.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
-#include "runtime/orderAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "runtime/thread.hpp"
 
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -29,6 +29,7 @@
 #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
 #include "gc/shenandoah/shenandoahTraversalGC.hpp"
 #include "logging/logStream.hpp"
+#include "runtime/orderAccess.hpp"
 
 ShenandoahFreeSet::ShenandoahFreeSet(ShenandoahHeap* heap, size_t max_regions) :
   _heap(heap),
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -71,8 +71,10 @@
 
 #include "memory/metaspace.hpp"
 #include "oops/compressedOops.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/safepointMechanism.hpp"
 #include "runtime/vmThread.hpp"
 #include "services/mallocTracker.hpp"
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -34,6 +34,7 @@
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/java.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -27,6 +27,7 @@
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahHeapRegionCounters.hpp"
 #include "memory/resourceArea.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/perfData.inline.hpp"
 
 ShenandoahHeapRegionCounters::ShenandoahHeapRegionCounters() :
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -48,6 +48,7 @@
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/biasedLocking.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/growableArray.hpp"
--- a/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -26,6 +26,7 @@
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahPacer.hpp"
+#include "runtime/atomic.hpp"
 
 /*
  * In normal concurrent cycle, we have to pace the application to let GC finish.
--- a/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -25,7 +25,7 @@
 #define SHARE_GC_SHENANDOAH_SHENANDOAHSHAREDVARIABLES_HPP
 
 #include "memory/allocation.hpp"
-#include "runtime/orderAccess.hpp"
+#include "runtime/atomic.hpp"
 
 typedef jbyte ShenandoahSharedValue;
 
--- a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -26,6 +26,7 @@
 #include "gc/shared/owstTaskTerminator.hpp"
 #include "gc/shared/taskqueue.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/mutex.hpp"
 #include "runtime/thread.hpp"
 
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -35,6 +35,7 @@
 #include "memory/iterator.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/compressedOops.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/align.hpp"
 
 // Avoid name collision on verify_oop (defined in macroAssembler_arm.hpp)
--- a/src/hotspot/share/gc/z/zLiveMap.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/z/zLiveMap.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -28,7 +28,6 @@
 #include "gc/z/zThread.inline.hpp"
 #include "logging/log.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
 #include "utilities/debug.hpp"
 
 static const ZStatCounter ZCounterMarkSeqNumResetContention("Contention", "Mark SeqNum Reset Contention", ZStatUnitOpsPerSecond);
--- a/src/hotspot/share/gc/z/zMark.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/z/zMark.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -44,7 +44,6 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/handshake.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/align.hpp"
--- a/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -25,7 +25,6 @@
 #define SHARE_GC_Z_ZMARKTERMINATE_INLINE_HPP
 
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
 
 inline ZMarkTerminate::ZMarkTerminate() :
     _nworkers(0),
--- a/src/hotspot/share/gc/z/zNMethod.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/z/zNMethod.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -41,7 +41,6 @@
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
 #include "utilities/debug.hpp"
 
 static ZNMethodData* gc_data(const nmethod* nm) {
--- a/src/hotspot/share/gc/z/zNMethodData.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/z/zNMethodData.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -27,7 +27,6 @@
 #include "gc/z/zNMethodData.hpp"
 #include "memory/allocation.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/growableArray.hpp"
--- a/src/hotspot/share/gc/z/zNMethodTable.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/z/zNMethodTable.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -43,7 +43,6 @@
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
 #include "utilities/debug.hpp"
 
 ZNMethodTableEntry* ZNMethodTable::_table = NULL;
--- a/src/hotspot/share/gc/z/zReferenceProcessor.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/gc/z/zReferenceProcessor.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -34,6 +34,7 @@
 #include "gc/z/zUtils.inline.hpp"
 #include "gc/z/zValue.inline.hpp"
 #include "memory/universe.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
 
--- a/src/hotspot/share/interpreter/oopMapCache.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/interpreter/oopMapCache.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -29,6 +29,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/signature.hpp"
 
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -46,7 +46,6 @@
 #include "jfr/utilities/jfrTypes.hpp"
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
-#include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/orderAccess.hpp"
--- a/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -39,7 +39,6 @@
 #include "jfr/writers/jfrNativeEventWriter.hpp"
 #include "logging/log.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/thread.hpp"
--- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -33,8 +33,8 @@
 #include "jfr/recorder/stringpool/jfrStringPoolWriter.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
 #include "logging/log.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/thread.inline.hpp"
 
--- a/src/hotspot/share/jfr/utilities/jfrHashtable.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/jfr/utilities/jfrHashtable.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -26,7 +26,7 @@
 #define SHARE_JFR_UTILITIES_JFRHASHTABLE_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
-#include "runtime/orderAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
 
--- a/src/hotspot/share/jvmci/jvmciCompiler.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/jvmci/jvmciCompiler.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -25,6 +25,7 @@
 #define SHARE_JVMCI_JVMCICOMPILER_HPP
 
 #include "compiler/abstractCompiler.hpp"
+#include "runtime/atomic.hpp"
 
 class JVMCICompiler : public AbstractCompiler {
 private:
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -42,6 +42,7 @@
 #include "oops/method.inline.hpp"
 #include "oops/typeArrayOop.inline.hpp"
 #include "prims/nativeLookup.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
 #include "runtime/frame.inline.hpp"
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -34,6 +34,7 @@
 #include "oops/method.inline.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/biasedLocking.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
--- a/src/hotspot/share/jvmci/metadataHandleBlock.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/jvmci/metadataHandleBlock.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -23,6 +23,7 @@
 
 #include "precompiled.hpp"
 #include "jvmci/metadataHandleBlock.hpp"
+#include "runtime/atomic.hpp"
 
 MetadataHandleBlock* MetadataHandleBlock::_last = NULL;
 intptr_t             MetadataHandleBlock::_free_list = 0;
--- a/src/hotspot/share/logging/logDecorations.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/logging/logDecorations.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -26,7 +26,6 @@
 #include "logging/logConfiguration.hpp"
 #include "logging/logDecorations.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/thread.inline.hpp"
 #include "services/management.hpp"
--- a/src/hotspot/share/memory/allocation.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/memory/allocation.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -28,7 +28,6 @@
 #include "memory/arena.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
-#include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "runtime/task.hpp"
 #include "runtime/threadCritical.hpp"
--- a/src/hotspot/share/memory/arena.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/memory/arena.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -27,7 +27,6 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
-#include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "runtime/task.hpp"
 #include "runtime/threadCritical.hpp"
--- a/src/hotspot/share/memory/metaspace.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/memory/metaspace.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -40,8 +40,8 @@
 #include "memory/metaspaceTracer.hpp"
 #include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/init.hpp"
-#include "runtime/orderAccess.hpp"
 #include "services/memTracker.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/debug.hpp"
--- a/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -32,6 +32,7 @@
 #include "memory/metaspace/metaspaceCommon.hpp"
 #include "memory/metaspace/virtualSpaceList.hpp"
 #include "memory/metaspace/virtualSpaceNode.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/safepoint.hpp"
@@ -444,4 +445,3 @@
 #endif // ASSERT
 
 } // namespace metaspace
-
--- a/src/hotspot/share/oops/accessBackend.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/oops/accessBackend.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -29,6 +29,8 @@
 #include "oops/accessBackend.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oopsHierarchy.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/orderAccess.hpp"
 
 template <DecoratorSet decorators>
 template <DecoratorSet idecorators, typename T>
--- a/src/hotspot/share/oops/arrayKlass.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/oops/arrayKlass.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -25,7 +25,7 @@
 #ifndef SHARE_OOPS_ARRAYKLASS_INLINE_HPP
 #define SHARE_OOPS_ARRAYKLASS_INLINE_HPP
 
-#include "runtime/orderAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "oops/arrayKlass.hpp"
 
 inline Klass* ArrayKlass::higher_dimension_acquire() const {
--- a/src/hotspot/share/oops/constantPool.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/oops/constantPool.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -27,7 +27,7 @@
 
 #include "oops/constantPool.hpp"
 #include "oops/cpCache.inline.hpp"
-#include "runtime/orderAccess.hpp"
+#include "runtime/atomic.hpp"
 
 inline CPSlot ConstantPool::slot_at(int which) const {
   assert(is_within_bounds(which), "index out of bounds");
--- a/src/hotspot/share/oops/cpCache.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/oops/cpCache.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -44,7 +44,6 @@
 #include "prims/methodHandles.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
-#include "runtime/orderAccess.hpp"
 #include "utilities/macros.hpp"
 
 // Implementation of ConstantPoolCacheEntry
--- a/src/hotspot/share/oops/cpCache.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/oops/cpCache.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -27,7 +27,7 @@
 
 #include "oops/cpCache.hpp"
 #include "oops/oopHandle.inline.hpp"
-#include "runtime/orderAccess.hpp"
+#include "runtime/atomic.hpp"
 
 inline int ConstantPoolCacheEntry::indices_ord() const { return Atomic::load_acquire(&_indices); }
 
--- a/src/hotspot/share/oops/instanceKlass.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/oops/instanceKlass.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -29,7 +29,7 @@
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/orderAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
--- a/src/hotspot/share/oops/klass.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/oops/klass.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -47,7 +47,6 @@
 #include "oops/oopHandle.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
-#include "runtime/orderAccess.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/stack.inline.hpp"
 
--- a/src/hotspot/share/oops/method.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/oops/method.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -58,6 +58,7 @@
 #include "prims/methodHandles.hpp"
 #include "prims/nativeLookup.hpp"
 #include "runtime/arguments.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/init.hpp"
--- a/src/hotspot/share/oops/method.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/oops/method.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -26,7 +26,7 @@
 #define SHARE_OOPS_METHOD_INLINE_HPP
 
 #include "oops/method.hpp"
-#include "runtime/orderAccess.hpp"
+#include "runtime/atomic.hpp"
 
 inline address Method::from_compiled_entry() const {
   return Atomic::load_acquire(&_from_compiled_entry);
--- a/src/hotspot/share/oops/methodData.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/oops/methodData.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -26,7 +26,7 @@
 #define SHARE_OOPS_METHODDATA_INLINE_HPP
 
 #include "oops/methodData.hpp"
-#include "runtime/orderAccess.hpp"
+#include "runtime/atomic.hpp"
 
 inline void DataLayout::release_set_cell_at(int index, intptr_t value) {
   Atomic::release_store(&_cells[index], value);
--- a/src/hotspot/share/oops/oop.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/oops/oop.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -35,7 +35,6 @@
 #include "oops/markWord.inline.hpp"
 #include "oops/oop.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/macros.hpp"
--- a/src/hotspot/share/prims/jni.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/prims/jni.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -72,7 +72,6 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/jfieldIDWorkaround.hpp"
 #include "runtime/jniHandles.inline.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/reflection.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/sharedRuntime.hpp"
--- a/src/hotspot/share/prims/jvm.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/prims/jvm.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -70,7 +70,6 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/jfieldIDWorkaround.hpp"
 #include "runtime/jniHandles.inline.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/perfData.hpp"
 #include "runtime/reflection.hpp"
--- a/src/hotspot/share/prims/jvmtiEnvBase.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/prims/jvmtiEnvBase.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -30,9 +30,9 @@
 #include "prims/jvmtiEventController.hpp"
 #include "prims/jvmtiThreadState.hpp"
 #include "oops/oopHandle.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/fieldDescriptor.hpp"
 #include "runtime/frame.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/vmOperations.hpp"
 #include "utilities/growableArray.hpp"
--- a/src/hotspot/share/prims/jvmtiImpl.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/prims/jvmtiImpl.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -38,7 +38,6 @@
 #include "prims/jvmtiEventController.inline.hpp"
 #include "prims/jvmtiImpl.hpp"
 #include "prims/jvmtiRedefineClasses.hpp"
-#include "runtime/atomic.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/handles.inline.hpp"
--- a/src/hotspot/share/prims/resolvedMethodTable.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/prims/resolvedMethodTable.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -35,6 +35,7 @@
 #include "oops/oop.inline.hpp"
 #include "oops/weakHandle.inline.hpp"
 #include "prims/resolvedMethodTable.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/mutexLocker.hpp"
--- a/src/hotspot/share/prims/unsafe.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/prims/unsafe.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -37,7 +37,6 @@
 #include "oops/oop.inline.hpp"
 #include "oops/typeArrayOop.inline.hpp"
 #include "prims/unsafe.hpp"
-#include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
--- a/src/hotspot/share/prims/whitebox.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/prims/whitebox.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -59,6 +59,7 @@
 #include "prims/wbtestmethods/parserTests.hpp"
 #include "prims/whitebox.inline.hpp"
 #include "runtime/arguments.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
 #include "runtime/flags/jvmFlag.hpp"
--- a/src/hotspot/share/runtime/deoptimization.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/runtime/deoptimization.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -1,3 +1,5 @@
+
+
 /*
  * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,6 +50,7 @@
 #include "oops/typeArrayOop.inline.hpp"
 #include "oops/verifyOopClosure.hpp"
 #include "prims/jvmtiThreadState.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/biasedLocking.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/fieldDescriptor.hpp"
--- a/src/hotspot/share/runtime/handshake.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/runtime/handshake.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -26,9 +26,9 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/handshake.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/semaphore.inline.hpp"
 #include "runtime/task.hpp"
--- a/src/hotspot/share/runtime/init.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/runtime/init.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -35,11 +35,11 @@
 #include "logging/logTag.hpp"
 #include "memory/universe.hpp"
 #include "prims/methodHandles.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/flags/jvmFlag.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/init.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "services/memTracker.hpp"
--- a/src/hotspot/share/runtime/interfaceSupport.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/runtime/interfaceSupport.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -33,7 +33,6 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/init.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/safepointVerifiers.hpp"
--- a/src/hotspot/share/runtime/perfMemory.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/runtime/perfMemory.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -27,10 +27,10 @@
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "runtime/arguments.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/java.hpp"
 #include "runtime/mutex.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/perfData.hpp"
 #include "runtime/perfMemory.hpp"
--- a/src/hotspot/share/runtime/safepointMechanism.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/runtime/safepointMechanism.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "logging/log.hpp"
 #include "runtime/globals.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
 #include "services/memTracker.hpp"
--- a/src/hotspot/share/runtime/sweeper.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/runtime/sweeper.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -37,7 +37,6 @@
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/method.hpp"
-#include "runtime/atomic.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/handshake.hpp"
 #include "runtime/mutexLocker.hpp"
--- a/src/hotspot/share/runtime/threadHeapSampler.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/runtime/threadHeapSampler.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -24,8 +24,8 @@
  */
 
 #include "precompiled.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/threadHeapSampler.hpp"
 
--- a/src/hotspot/share/runtime/threadSMR.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/runtime/threadSMR.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -25,7 +25,9 @@
 #include "precompiled.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/jniHandles.inline.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/threadSMR.inline.hpp"
--- a/src/hotspot/share/runtime/vmThread.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/runtime/vmThread.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -35,6 +35,7 @@
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/verifyOopClosure.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/mutexLocker.hpp"
--- a/src/hotspot/share/services/lowMemoryDetector.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/services/lowMemoryDetector.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -26,6 +26,7 @@
 #define SHARE_SERVICES_LOWMEMORYDETECTOR_HPP
 
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "services/memoryPool.hpp"
 #include "services/memoryService.hpp"
 #include "services/memoryUsage.hpp"
--- a/src/hotspot/share/services/mallocSiteTable.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/services/mallocSiteTable.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -25,6 +25,8 @@
 #ifndef SHARE_SERVICES_MALLOCSITETABLE_HPP
 #define SHARE_SERVICES_MALLOCSITETABLE_HPP
 
+#include "utilities/macros.hpp"
+
 #if INCLUDE_NMT
 
 #include "memory/allocation.hpp"
--- a/src/hotspot/share/services/mallocTracker.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/services/mallocTracker.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -23,7 +23,6 @@
  */
 #include "precompiled.hpp"
 
-#include "runtime/atomic.hpp"
 #include "services/mallocSiteTable.hpp"
 #include "services/mallocTracker.hpp"
 #include "services/mallocTracker.inline.hpp"
@@ -153,5 +152,3 @@
   header->release();
   return (void*)header;
 }
-
-
--- a/src/hotspot/share/services/memTracker.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/services/memTracker.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -24,6 +24,7 @@
 #include "precompiled.hpp"
 #include "jvm.h"
 
+#include "runtime/atomic.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/vmThread.hpp"
 #include "runtime/vmOperations.hpp"
--- a/src/hotspot/share/services/memoryManager.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/services/memoryManager.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -27,9 +27,9 @@
 #include "classfile/vmSymbols.hpp"
 #include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaCalls.hpp"
-#include "runtime/orderAccess.hpp"
 #include "services/lowMemoryDetector.hpp"
 #include "services/management.hpp"
 #include "services/memoryManager.hpp"
--- a/src/hotspot/share/services/memoryPool.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/services/memoryPool.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -27,9 +27,9 @@
 #include "classfile/vmSymbols.hpp"
 #include "memory/metaspace.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaCalls.hpp"
-#include "runtime/orderAccess.hpp"
 #include "services/lowMemoryDetector.hpp"
 #include "services/management.hpp"
 #include "services/memoryManager.hpp"
--- a/src/hotspot/share/services/threadIdTable.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/services/threadIdTable.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -24,6 +24,7 @@
 */
 
 #include "precompiled.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/threadSMR.hpp"
@@ -32,7 +33,6 @@
 #include "utilities/concurrentHashTable.inline.hpp"
 #include "utilities/concurrentHashTableTasks.inline.hpp"
 
-
 typedef ConcurrentHashTable<ThreadIdTableConfig, mtInternal> ThreadIdTableHash;
 
 // 2^24 is max size
--- a/src/hotspot/share/services/threadStackTracker.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/services/threadStackTracker.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -23,7 +23,6 @@
 
 #include "precompiled.hpp"
 
-#include "runtime/atomic.hpp"
 #include "runtime/threadCritical.hpp"
 #include "services/mallocTracker.hpp"
 #include "services/memTracker.hpp"
--- a/src/hotspot/share/services/virtualMemoryTracker.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/services/virtualMemoryTracker.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -25,7 +25,6 @@
 
 #include "logging/log.hpp"
 #include "memory/metaspace.hpp"
-#include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "runtime/threadCritical.hpp"
 #include "services/memTracker.hpp"
--- a/src/hotspot/share/utilities/bitMap.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/utilities/bitMap.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -26,7 +26,6 @@
 #define SHARE_UTILITIES_BITMAP_INLINE_HPP
 
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
 #include "utilities/bitMap.hpp"
 #include "utilities/count_trailing_zeros.hpp"
 
--- a/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -25,6 +25,7 @@
 #ifndef SHARE_UTILITIES_CONCURRENTHASHTABLETASKS_INLINE_HPP
 #define SHARE_UTILITIES_CONCURRENTHASHTABLETASKS_INLINE_HPP
 
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/concurrentHashTable.inline.hpp"
 
--- a/src/hotspot/share/utilities/globalCounter.cpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/utilities/globalCounter.cpp	Tue Nov 26 10:47:46 2019 +0100
@@ -24,7 +24,7 @@
 
 #include "precompiled.hpp"
 #include "utilities/globalCounter.hpp"
-#include "runtime/orderAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/threadSMR.inline.hpp"
 #include "runtime/vmThread.hpp"
--- a/src/hotspot/share/utilities/globalCounter.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/utilities/globalCounter.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -26,7 +26,6 @@
 #define SHARE_UTILITIES_GLOBALCOUNTER_INLINE_HPP
 
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
 #include "runtime/thread.inline.hpp"
 #include "utilities/globalCounter.hpp"
 
--- a/src/hotspot/share/utilities/hashtable.inline.hpp	Wed Nov 27 10:21:22 2019 +0100
+++ b/src/hotspot/share/utilities/hashtable.inline.hpp	Tue Nov 26 10:47:46 2019 +0100
@@ -26,7 +26,7 @@
 #define SHARE_UTILITIES_HASHTABLE_INLINE_HPP
 
 #include "memory/allocation.inline.hpp"
-#include "runtime/orderAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/hashtable.hpp"
 #include "utilities/dtrace.hpp"