--- old/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp 2019-11-26 12:09:02.172861373 +0100 +++ new/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp 2019-11-26 12:09:01.968857853 +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" --- old/src/hotspot/cpu/arm/nativeInst_arm_32.hpp 2019-11-26 12:09:02.536867654 +0100 +++ new/src/hotspot/cpu/arm/nativeInst_arm_32.hpp 2019-11-26 12:09:02.336864203 +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" --- old/src/hotspot/cpu/arm/relocInfo_arm.cpp 2019-11-26 12:09:02.952874832 +0100 +++ new/src/hotspot/cpu/arm/relocInfo_arm.cpp 2019-11-26 12:09:02.700870484 +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) { --- old/src/hotspot/cpu/x86/rdtsc_x86.cpp 2019-11-26 12:09:03.376882149 +0100 +++ new/src/hotspot/cpu/x86/rdtsc_x86.cpp 2019-11-26 12:09:03.120877731 +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" --- old/src/hotspot/cpu/zero/cppInterpreter_zero.cpp 2019-11-26 12:09:03.804889534 +0100 +++ new/src/hotspot/cpu/zero/cppInterpreter_zero.cpp 2019-11-26 12:09:03.548885117 +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" --- old/src/hotspot/os/aix/os_aix.cpp 2019-11-26 12:09:04.232896919 +0100 +++ new/src/hotspot/os/aix/os_aix.cpp 2019-11-26 12:09:03.976892502 +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" --- old/src/hotspot/os/linux/os_linux.cpp 2019-11-26 12:09:04.748905823 +0100 +++ new/src/hotspot/os/linux/os_linux.cpp 2019-11-26 12:09:04.488901337 +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" --- old/src/hotspot/os/posix/os_posix.cpp 2019-11-26 12:09:05.272914864 +0100 +++ new/src/hotspot/os/posix/os_posix.cpp 2019-11-26 12:09:05.024910585 +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" --- old/src/hotspot/os/windows/osThread_windows.cpp 2019-11-26 12:09:05.744923009 +0100 +++ new/src/hotspot/os/windows/osThread_windows.cpp 2019-11-26 12:09:05.492918661 +0100 @@ -23,7 +23,6 @@ */ // no precompiled headers -#include "runtime/orderAccess.hpp" #include "runtime/os.hpp" #include "runtime/osThread.hpp" --- old/src/hotspot/share/aot/aotCodeHeap.cpp 2019-11-26 12:09:06.112929359 +0100 +++ new/src/hotspot/share/aot/aotCodeHeap.cpp 2019-11-26 12:09:05.904925770 +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" --- old/src/hotspot/share/aot/aotCompiledMethod.cpp 2019-11-26 12:09:06.492935915 +0100 +++ new/src/hotspot/share/aot/aotCompiledMethod.cpp 2019-11-26 12:09:06.292932464 +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" --- old/src/hotspot/share/asm/assembler.cpp 2019-11-26 12:09:06.872942473 +0100 +++ new/src/hotspot/share/asm/assembler.cpp 2019-11-26 12:09:06.668938953 +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" --- old/src/hotspot/share/classfile/classLoader.inline.hpp 2019-11-26 12:09:07.244948891 +0100 +++ new/src/hotspot/share/classfile/classLoader.inline.hpp 2019-11-26 12:09:07.036945303 +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); } --- old/src/hotspot/share/classfile/classLoaderData.cpp 2019-11-26 12:09:07.652955932 +0100 +++ new/src/hotspot/share/classfile/classLoaderData.cpp 2019-11-26 12:09:07.400951583 +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" --- old/src/hotspot/share/classfile/classLoaderDataGraph.cpp 2019-11-26 12:09:08.088963454 +0100 +++ new/src/hotspot/share/classfile/classLoaderDataGraph.cpp 2019-11-26 12:09:07.840959175 +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" --- old/src/hotspot/share/classfile/dictionary.cpp 2019-11-26 12:09:08.468970011 +0100 +++ new/src/hotspot/share/classfile/dictionary.cpp 2019-11-26 12:09:08.260966422 +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" --- old/src/hotspot/share/classfile/systemDictionary.cpp 2019-11-26 12:09:08.840976430 +0100 +++ new/src/hotspot/share/classfile/systemDictionary.cpp 2019-11-26 12:09:08.636972910 +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" --- old/src/hotspot/share/classfile/verifier.cpp 2019-11-26 12:09:09.304984436 +0100 +++ new/src/hotspot/share/classfile/verifier.cpp 2019-11-26 12:09:09.052980088 +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" --- old/src/hotspot/share/code/codeCache.cpp 2019-11-26 12:09:09.800992994 +0100 +++ new/src/hotspot/share/code/codeCache.cpp 2019-11-26 12:09:09.544988576 +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" --- old/src/hotspot/share/code/compiledMethod.cpp 2019-11-26 12:09:10.261000931 +0100 +++ new/src/hotspot/share/code/compiledMethod.cpp 2019-11-26 12:09:10.008996583 +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" --- old/src/hotspot/share/code/compiledMethod.inline.hpp 2019-11-26 12:09:10.693008385 +0100 +++ new/src/hotspot/share/code/compiledMethod.inline.hpp 2019-11-26 12:09:10.437003967 +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); } --- old/src/hotspot/share/code/dependencyContext.cpp 2019-11-26 12:09:11.113015632 +0100 +++ new/src/hotspot/share/code/dependencyContext.cpp 2019-11-26 12:09:10.861011283 +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" --- old/src/hotspot/share/compiler/compileBroker.hpp 2019-11-26 12:09:11.545023085 +0100 +++ new/src/hotspot/share/compiler/compileBroker.hpp 2019-11-26 12:09:11.289018668 +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 --- old/src/hotspot/share/gc/epsilon/epsilonHeap.cpp 2019-11-26 12:09:11.977030539 +0100 +++ new/src/hotspot/share/gc/epsilon/epsilonHeap.cpp 2019-11-26 12:09:11.725026191 +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() { --- old/src/hotspot/share/gc/g1/g1BarrierSet.cpp 2019-11-26 12:09:12.433038406 +0100 +++ new/src/hotspot/share/gc/g1/g1BarrierSet.cpp 2019-11-26 12:09:12.157033644 +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 --- old/src/hotspot/share/gc/g1/g1CardTable.cpp 2019-11-26 12:09:12.865045860 +0100 +++ new/src/hotspot/share/gc/g1/g1CardTable.cpp 2019-11-26 12:09:12.613041512 +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()); --- old/src/hotspot/share/gc/g1/g1CodeCacheRemSet.cpp 2019-11-26 12:09:13.285053107 +0100 +++ new/src/hotspot/share/gc/g1/g1CodeCacheRemSet.cpp 2019-11-26 12:09:13.029048690 +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" --- old/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp 2019-11-26 12:09:13.717060560 +0100 +++ new/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp 2019-11-26 12:09:13.461056144 +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(); --- old/src/hotspot/share/gc/g1/g1CollectionSet.cpp 2019-11-26 12:09:14.145067945 +0100 +++ new/src/hotspot/share/gc/g1/g1CollectionSet.cpp 2019-11-26 12:09:13.893063597 +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" --- old/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp 2019-11-26 12:09:14.589075605 +0100 +++ new/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp 2019-11-26 12:09:14.325071050 +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" --- old/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp 2019-11-26 12:09:15.073083956 +0100 +++ new/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp 2019-11-26 12:09:14.817079539 +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" --- old/src/hotspot/share/gc/g1/g1ParallelCleaning.cpp 2019-11-26 12:09:15.497091271 +0100 +++ new/src/hotspot/share/gc/g1/g1ParallelCleaning.cpp 2019-11-26 12:09:15.245086924 +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 --- old/src/hotspot/share/gc/g1/g1RemSet.cpp 2019-11-26 12:09:15.921098587 +0100 +++ new/src/hotspot/share/gc/g1/g1RemSet.cpp 2019-11-26 12:09:15.665094170 +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" --- old/src/hotspot/share/gc/g1/g1StringDedup.cpp 2019-11-26 12:09:16.377106454 +0100 +++ new/src/hotspot/share/gc/g1/g1StringDedup.cpp 2019-11-26 12:09:16.129102175 +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); } } - --- old/src/hotspot/share/gc/g1/heapRegion.cpp 2019-11-26 12:09:16.805113839 +0100 +++ new/src/hotspot/share/gc/g1/heapRegion.cpp 2019-11-26 12:09:16.549109422 +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; --- old/src/hotspot/share/gc/g1/heapRegionManager.cpp 2019-11-26 12:09:17.249121499 +0100 +++ new/src/hotspot/share/gc/g1/heapRegionManager.cpp 2019-11-26 12:09:16.993117082 +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 { --- old/src/hotspot/share/gc/g1/heapRegionRemSet.hpp 2019-11-26 12:09:17.685129021 +0100 +++ new/src/hotspot/share/gc/g1/heapRegionRemSet.hpp 2019-11-26 12:09:17.429124604 +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 --- old/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp 2019-11-26 12:09:18.121136544 +0100 +++ new/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp 2019-11-26 12:09:17.865132127 +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 --- old/src/hotspot/share/gc/g1/sparsePRT.cpp 2019-11-26 12:09:18.545143859 +0100 +++ new/src/hotspot/share/gc/g1/sparsePRT.cpp 2019-11-26 12:09:18.293139511 +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 --- old/src/hotspot/share/gc/parallel/psCompactionManager.cpp 2019-11-26 12:09:18.929150484 +0100 +++ new/src/hotspot/share/gc/parallel/psCompactionManager.cpp 2019-11-26 12:09:18.721146895 +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; --- old/src/hotspot/share/gc/parallel/psParallelCompact.hpp 2019-11-26 12:09:19.357157868 +0100 +++ new/src/hotspot/share/gc/parallel/psParallelCompact.hpp 2019-11-26 12:09:19.093153314 +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; --- old/src/hotspot/share/gc/serial/defNewGeneration.cpp 2019-11-26 12:09:19.805165597 +0100 +++ new/src/hotspot/share/gc/serial/defNewGeneration.cpp 2019-11-26 12:09:19.549161181 +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" --- old/src/hotspot/share/gc/shared/concurrentGCThread.cpp 2019-11-26 12:09:20.253173326 +0100 +++ new/src/hotspot/share/gc/shared/concurrentGCThread.cpp 2019-11-26 12:09:19.993168841 +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() : --- old/src/hotspot/share/gc/shared/parallelCleaning.cpp 2019-11-26 12:09:20.677180642 +0100 +++ new/src/hotspot/share/gc/shared/parallelCleaning.cpp 2019-11-26 12:09:20.421176225 +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, --- old/src/hotspot/share/gc/shared/preservedMarks.cpp 2019-11-26 12:09:21.101187956 +0100 +++ new/src/hotspot/share/gc/shared/preservedMarks.cpp 2019-11-26 12:09:20.849183609 +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() { --- old/src/hotspot/share/gc/shared/ptrQueue.cpp 2019-11-26 12:09:21.529195340 +0100 +++ new/src/hotspot/share/gc/shared/ptrQueue.cpp 2019-11-26 12:09:21.273190924 +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" --- old/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp 2019-11-26 12:09:21.953202655 +0100 +++ new/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp 2019-11-26 12:09:21.697198239 +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) --- old/src/hotspot/share/gc/shared/satbMarkQueue.cpp 2019-11-26 12:09:22.365209763 +0100 +++ new/src/hotspot/share/gc/shared/satbMarkQueue.cpp 2019-11-26 12:09:22.113205416 +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" --- old/src/hotspot/share/gc/shared/space.cpp 2019-11-26 12:09:22.785217009 +0100 +++ new/src/hotspot/share/gc/shared/space.cpp 2019-11-26 12:09:22.533212661 +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" --- old/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp 2019-11-26 12:09:23.221224531 +0100 +++ new/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp 2019-11-26 12:09:22.969220184 +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" --- old/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.cpp 2019-11-26 12:09:23.653231984 +0100 +++ new/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.cpp 2019-11-26 12:09:23.401227637 +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; --- old/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp 2019-11-26 12:09:24.077239298 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp 2019-11-26 12:09:23.821234883 +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() : --- old/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp 2019-11-26 12:09:24.501246613 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp 2019-11-26 12:09:24.253242335 +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* heaps) { _length = heaps->length(); --- old/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp 2019-11-26 12:09:24.941254204 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp 2019-11-26 12:09:24.677249650 +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(), --- old/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.cpp 2019-11-26 12:09:25.369261588 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.cpp 2019-11-26 12:09:25.121257310 +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" --- old/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp 2019-11-26 12:09:25.789268833 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp 2019-11-26 12:09:25.533264417 +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), --- old/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp 2019-11-26 12:09:26.221276286 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp 2019-11-26 12:09:25.965271870 +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" --- old/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp 2019-11-26 12:09:26.717284843 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp 2019-11-26 12:09:26.461280427 +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" --- old/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp 2019-11-26 12:09:27.141292158 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp 2019-11-26 12:09:26.885287741 +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() : --- old/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp 2019-11-26 12:09:27.569299541 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp 2019-11-26 12:09:27.317295194 +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" --- old/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp 2019-11-26 12:09:28.005307063 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp 2019-11-26 12:09:27.753302715 +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. --- old/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp 2019-11-26 12:09:28.429314377 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp 2019-11-26 12:09:28.177310030 +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; --- old/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp 2019-11-26 12:09:28.865321899 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp 2019-11-26 12:09:28.609317483 +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" --- old/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp 2019-11-26 12:09:29.301329420 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp 2019-11-26 12:09:29.045325004 +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) --- old/src/hotspot/share/gc/z/zLiveMap.cpp 2019-11-26 12:09:29.745337079 +0100 +++ new/src/hotspot/share/gc/z/zLiveMap.cpp 2019-11-26 12:09:29.493332732 +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); --- old/src/hotspot/share/gc/z/zMark.cpp 2019-11-26 12:09:30.157344187 +0100 +++ new/src/hotspot/share/gc/z/zMark.cpp 2019-11-26 12:09:29.909339909 +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" --- old/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp 2019-11-26 12:09:30.597351777 +0100 +++ new/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp 2019-11-26 12:09:30.341347361 +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), --- old/src/hotspot/share/gc/z/zNMethod.cpp 2019-11-26 12:09:31.017359022 +0100 +++ new/src/hotspot/share/gc/z/zNMethod.cpp 2019-11-26 12:09:30.761354606 +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) { --- old/src/hotspot/share/gc/z/zNMethodData.cpp 2019-11-26 12:09:31.441366337 +0100 +++ new/src/hotspot/share/gc/z/zNMethodData.cpp 2019-11-26 12:09:31.189361990 +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" --- old/src/hotspot/share/gc/z/zNMethodTable.cpp 2019-11-26 12:09:31.865373651 +0100 +++ new/src/hotspot/share/gc/z/zNMethodTable.cpp 2019-11-26 12:09:31.609369235 +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; --- old/src/hotspot/share/gc/z/zReferenceProcessor.cpp 2019-11-26 12:09:32.273380689 +0100 +++ new/src/hotspot/share/gc/z/zReferenceProcessor.cpp 2019-11-26 12:09:32.029376480 +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" --- old/src/hotspot/share/interpreter/oopMapCache.cpp 2019-11-26 12:09:32.649387175 +0100 +++ new/src/hotspot/share/interpreter/oopMapCache.cpp 2019-11-26 12:09:32.445383656 +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" --- old/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp 2019-11-26 12:09:33.081394627 +0100 +++ new/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp 2019-11-26 12:09:32.825390211 +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" --- old/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp 2019-11-26 12:09:33.517402148 +0100 +++ new/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp 2019-11-26 12:09:33.265397801 +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" --- old/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp 2019-11-26 12:09:33.961409808 +0100 +++ new/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp 2019-11-26 12:09:33.705405392 +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" --- old/src/hotspot/share/jfr/utilities/jfrHashtable.hpp 2019-11-26 12:09:34.393417260 +0100 +++ new/src/hotspot/share/jfr/utilities/jfrHashtable.hpp 2019-11-26 12:09:34.133412774 +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" --- old/src/hotspot/share/jvmci/jvmciCompiler.hpp 2019-11-26 12:09:34.821424643 +0100 +++ new/src/hotspot/share/jvmci/jvmciCompiler.hpp 2019-11-26 12:09:34.569420295 +0100 @@ -25,6 +25,7 @@ #define SHARE_JVMCI_JVMCICOMPILER_HPP #include "compiler/abstractCompiler.hpp" +#include "runtime/atomic.hpp" class JVMCICompiler : public AbstractCompiler { private: --- old/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp 2019-11-26 12:09:35.257432163 +0100 +++ new/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp 2019-11-26 12:09:34.997427679 +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" --- old/src/hotspot/share/jvmci/jvmciRuntime.cpp 2019-11-26 12:09:35.769440995 +0100 +++ new/src/hotspot/share/jvmci/jvmciRuntime.cpp 2019-11-26 12:09:35.505436442 +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" --- old/src/hotspot/share/jvmci/metadataHandleBlock.cpp 2019-11-26 12:09:36.233449000 +0100 +++ new/src/hotspot/share/jvmci/metadataHandleBlock.cpp 2019-11-26 12:09:35.977444584 +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; --- old/src/hotspot/share/logging/logDecorations.cpp 2019-11-26 12:09:36.657456313 +0100 +++ new/src/hotspot/share/logging/logDecorations.cpp 2019-11-26 12:09:36.405451966 +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" --- old/src/hotspot/share/memory/allocation.cpp 2019-11-26 12:09:37.085463696 +0100 +++ new/src/hotspot/share/memory/allocation.cpp 2019-11-26 12:09:36.829459280 +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" --- old/src/hotspot/share/memory/arena.cpp 2019-11-26 12:09:37.517471148 +0100 +++ new/src/hotspot/share/memory/arena.cpp 2019-11-26 12:09:37.261466732 +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" --- old/src/hotspot/share/memory/metaspace.cpp 2019-11-26 12:09:37.941478462 +0100 +++ new/src/hotspot/share/memory/metaspace.cpp 2019-11-26 12:09:37.681473977 +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" --- old/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp 2019-11-26 12:09:38.397486328 +0100 +++ new/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp 2019-11-26 12:09:38.141481912 +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 - --- old/src/hotspot/share/oops/accessBackend.inline.hpp 2019-11-26 12:09:38.837493917 +0100 +++ new/src/hotspot/share/oops/accessBackend.inline.hpp 2019-11-26 12:09:38.581489501 +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 template --- old/src/hotspot/share/oops/arrayKlass.inline.hpp 2019-11-26 12:09:39.269501369 +0100 +++ new/src/hotspot/share/oops/arrayKlass.inline.hpp 2019-11-26 12:09:39.017497022 +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 { --- old/src/hotspot/share/oops/constantPool.inline.hpp 2019-11-26 12:09:39.693508683 +0100 +++ new/src/hotspot/share/oops/constantPool.inline.hpp 2019-11-26 12:09:39.437504267 +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"); --- old/src/hotspot/share/oops/cpCache.cpp 2019-11-26 12:09:40.121516065 +0100 +++ new/src/hotspot/share/oops/cpCache.cpp 2019-11-26 12:09:39.865511650 +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 --- old/src/hotspot/share/oops/cpCache.inline.hpp 2019-11-26 12:09:40.553523517 +0100 +++ new/src/hotspot/share/oops/cpCache.inline.hpp 2019-11-26 12:09:40.301519170 +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); } --- old/src/hotspot/share/oops/instanceKlass.inline.hpp 2019-11-26 12:09:40.981530900 +0100 +++ new/src/hotspot/share/oops/instanceKlass.inline.hpp 2019-11-26 12:09:40.721526415 +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" --- old/src/hotspot/share/oops/klass.cpp 2019-11-26 12:09:41.417538420 +0100 +++ new/src/hotspot/share/oops/klass.cpp 2019-11-26 12:09:41.161534005 +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" --- old/src/hotspot/share/oops/method.cpp 2019-11-26 12:09:41.857546010 +0100 +++ new/src/hotspot/share/oops/method.cpp 2019-11-26 12:09:41.601541594 +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" --- old/src/hotspot/share/oops/method.inline.hpp 2019-11-26 12:09:42.321554013 +0100 +++ new/src/hotspot/share/oops/method.inline.hpp 2019-11-26 12:09:42.065549597 +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); --- old/src/hotspot/share/oops/methodData.inline.hpp 2019-11-26 12:09:42.689560361 +0100 +++ new/src/hotspot/share/oops/methodData.inline.hpp 2019-11-26 12:09:42.481556773 +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); --- old/src/hotspot/share/oops/oop.inline.hpp 2019-11-26 12:09:43.049566570 +0100 +++ new/src/hotspot/share/oops/oop.inline.hpp 2019-11-26 12:09:42.845563051 +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" --- old/src/hotspot/share/prims/jni.cpp 2019-11-26 12:09:43.421572986 +0100 +++ new/src/hotspot/share/prims/jni.cpp 2019-11-26 12:09:43.213569399 +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" --- old/src/hotspot/share/prims/jvm.cpp 2019-11-26 12:09:43.909581404 +0100 +++ new/src/hotspot/share/prims/jvm.cpp 2019-11-26 12:09:43.657577057 +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" --- old/src/hotspot/share/prims/jvmtiEnvBase.hpp 2019-11-26 12:09:44.405589959 +0100 +++ new/src/hotspot/share/prims/jvmtiEnvBase.hpp 2019-11-26 12:09:44.153585613 +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" --- old/src/hotspot/share/prims/jvmtiImpl.cpp 2019-11-26 12:09:44.849597617 +0100 +++ new/src/hotspot/share/prims/jvmtiImpl.cpp 2019-11-26 12:09:44.589593133 +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" --- old/src/hotspot/share/prims/resolvedMethodTable.cpp 2019-11-26 12:09:45.293605276 +0100 +++ new/src/hotspot/share/prims/resolvedMethodTable.cpp 2019-11-26 12:09:45.037600860 +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" --- old/src/hotspot/share/prims/unsafe.cpp 2019-11-26 12:09:45.729612796 +0100 +++ new/src/hotspot/share/prims/unsafe.cpp 2019-11-26 12:09:45.477608449 +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" --- old/src/hotspot/share/prims/whitebox.cpp 2019-11-26 12:09:46.177620523 +0100 +++ new/src/hotspot/share/prims/whitebox.cpp 2019-11-26 12:09:45.925616176 +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" --- old/src/hotspot/share/runtime/deoptimization.cpp 2019-11-26 12:09:46.629628319 +0100 +++ new/src/hotspot/share/runtime/deoptimization.cpp 2019-11-26 12:09:46.377623973 +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" --- old/src/hotspot/share/runtime/handshake.cpp 2019-11-26 12:09:47.109636598 +0100 +++ new/src/hotspot/share/runtime/handshake.cpp 2019-11-26 12:09:46.853632183 +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" --- old/src/hotspot/share/runtime/init.cpp 2019-11-26 12:09:47.533643911 +0100 +++ new/src/hotspot/share/runtime/init.cpp 2019-11-26 12:09:47.281639565 +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" --- old/src/hotspot/share/runtime/interfaceSupport.cpp 2019-11-26 12:09:47.957651224 +0100 +++ new/src/hotspot/share/runtime/interfaceSupport.cpp 2019-11-26 12:09:47.701646809 +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" --- old/src/hotspot/share/runtime/perfMemory.cpp 2019-11-26 12:09:48.377658468 +0100 +++ new/src/hotspot/share/runtime/perfMemory.cpp 2019-11-26 12:09:48.125654122 +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" --- old/src/hotspot/share/runtime/safepointMechanism.cpp 2019-11-26 12:09:48.805665851 +0100 +++ new/src/hotspot/share/runtime/safepointMechanism.cpp 2019-11-26 12:09:48.549661435 +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" --- old/src/hotspot/share/runtime/sweeper.cpp 2019-11-26 12:09:49.229673163 +0100 +++ new/src/hotspot/share/runtime/sweeper.cpp 2019-11-26 12:09:48.973668748 +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" --- old/src/hotspot/share/runtime/threadHeapSampler.cpp 2019-11-26 12:09:49.665680683 +0100 +++ new/src/hotspot/share/runtime/threadHeapSampler.cpp 2019-11-26 12:09:49.413676337 +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" --- old/src/hotspot/share/runtime/threadSMR.cpp 2019-11-26 12:09:50.089687996 +0100 +++ new/src/hotspot/share/runtime/threadSMR.cpp 2019-11-26 12:09:49.833683581 +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" --- old/src/hotspot/share/runtime/vmThread.cpp 2019-11-26 12:09:50.489694895 +0100 +++ new/src/hotspot/share/runtime/vmThread.cpp 2019-11-26 12:09:50.285691377 +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" --- old/src/hotspot/share/services/lowMemoryDetector.hpp 2019-11-26 12:09:50.913702208 +0100 +++ new/src/hotspot/share/services/lowMemoryDetector.hpp 2019-11-26 12:09:50.665697931 +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" --- old/src/hotspot/share/services/mallocSiteTable.hpp 2019-11-26 12:09:51.341709590 +0100 +++ new/src/hotspot/share/services/mallocSiteTable.hpp 2019-11-26 12:09:51.081705105 +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" --- old/src/hotspot/share/services/mallocTracker.cpp 2019-11-26 12:09:51.769716972 +0100 +++ new/src/hotspot/share/services/mallocTracker.cpp 2019-11-26 12:09:51.517712625 +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; } - - --- old/src/hotspot/share/services/memTracker.cpp 2019-11-26 12:09:52.205724492 +0100 +++ new/src/hotspot/share/services/memTracker.cpp 2019-11-26 12:09:51.945720007 +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" --- old/src/hotspot/share/services/memoryManager.cpp 2019-11-26 12:09:52.637731942 +0100 +++ new/src/hotspot/share/services/memoryManager.cpp 2019-11-26 12:09:52.381727527 +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" --- old/src/hotspot/share/services/memoryPool.cpp 2019-11-26 12:09:53.061739255 +0100 +++ new/src/hotspot/share/services/memoryPool.cpp 2019-11-26 12:09:52.809734909 +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" --- old/src/hotspot/share/services/threadIdTable.cpp 2019-11-26 12:09:53.433745671 +0100 +++ new/src/hotspot/share/services/threadIdTable.cpp 2019-11-26 12:09:53.229742152 +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 ThreadIdTableHash; // 2^24 is max size --- old/src/hotspot/share/services/threadStackTracker.cpp 2019-11-26 12:09:53.805752087 +0100 +++ new/src/hotspot/share/services/threadStackTracker.cpp 2019-11-26 12:09:53.597748499 +0100 @@ -23,7 +23,6 @@ #include "precompiled.hpp" -#include "runtime/atomic.hpp" #include "runtime/threadCritical.hpp" #include "services/mallocTracker.hpp" #include "services/memTracker.hpp" --- old/src/hotspot/share/services/virtualMemoryTracker.cpp 2019-11-26 12:09:54.217759192 +0100 +++ new/src/hotspot/share/services/virtualMemoryTracker.cpp 2019-11-26 12:09:53.965754846 +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" --- old/src/hotspot/share/utilities/bitMap.inline.hpp 2019-11-26 12:09:54.661766850 +0100 +++ new/src/hotspot/share/utilities/bitMap.inline.hpp 2019-11-26 12:09:54.401762366 +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" --- old/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp 2019-11-26 12:09:55.077774025 +0100 +++ new/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp 2019-11-26 12:09:54.829769747 +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" --- old/src/hotspot/share/utilities/globalCounter.cpp 2019-11-26 12:09:55.489781130 +0100 +++ new/src/hotspot/share/utilities/globalCounter.cpp 2019-11-26 12:09:55.237776784 +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" --- old/src/hotspot/share/utilities/globalCounter.inline.hpp 2019-11-26 12:09:55.909788373 +0100 +++ new/src/hotspot/share/utilities/globalCounter.inline.hpp 2019-11-26 12:09:55.649783890 +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" --- old/src/hotspot/share/utilities/hashtable.inline.hpp 2019-11-26 12:09:56.333795686 +0100 +++ new/src/hotspot/share/utilities/hashtable.inline.hpp 2019-11-26 12:09:56.081791340 +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"