From 64f0f68958a74d4ee34c4b738759fc2278fa8b47 Mon Sep 17 00:00:00 2001 From: Stefan Karlsson Date: Mon, 31 May 2021 08:59:19 +0000 Subject: [PATCH] 8267464: Circular-dependency resilient inline headers Reviewed-by: kbarrett, eosterlund, dholmes, kvn --- doc/hotspot-style.html | 1 + doc/hotspot-style.md | 5 +++++ src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp | 2 +- src/hotspot/cpu/arm/icBuffer_arm.cpp | 3 +-- src/hotspot/cpu/arm/icache_arm.cpp | 2 +- src/hotspot/cpu/arm/jniFastGetField_arm.cpp | 2 +- src/hotspot/cpu/arm/nativeInst_arm_32.cpp | 2 +- src/hotspot/cpu/arm/relocInfo_arm.cpp | 1 - src/hotspot/cpu/arm/runtime_arm.cpp | 3 +-- src/hotspot/cpu/arm/sharedRuntime_arm.cpp | 3 +-- src/hotspot/cpu/arm/stubGenerator_arm.cpp | 3 +-- src/hotspot/cpu/arm/vtableStubs_arm.cpp | 3 +-- src/hotspot/cpu/ppc/icBuffer_ppc.cpp | 3 +-- src/hotspot/cpu/zero/assembler_zero.cpp | 2 +- src/hotspot/cpu/zero/icBuffer_zero.cpp | 3 +-- src/hotspot/cpu/zero/icache_zero.cpp | 2 +- src/hotspot/cpu/zero/jniFastGetField_zero.cpp | 2 +- src/hotspot/cpu/zero/nativeInst_zero.cpp | 2 +- src/hotspot/cpu/zero/sharedRuntime_zero.cpp | 3 +-- src/hotspot/cpu/zero/stubGenerator_zero.cpp | 3 +-- src/hotspot/cpu/zero/vm_version_zero.cpp | 2 +- src/hotspot/os/aix/os_aix.inline.hpp | 2 ++ src/hotspot/os/bsd/os_bsd.inline.hpp | 2 ++ src/hotspot/os/linux/os_linux.inline.hpp | 2 ++ src/hotspot/os/posix/os_posix.inline.hpp | 2 ++ src/hotspot/os/windows/os_windows.inline.hpp | 2 ++ src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp | 2 +- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 2 +- src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp | 2 +- src/hotspot/share/asm/macroAssembler.inline.hpp | 1 + src/hotspot/share/c1/c1_ValueSet.inline.hpp | 3 ++- src/hotspot/share/cds/archiveUtils.inline.hpp | 1 + src/hotspot/share/cds/heapShared.inline.hpp | 1 + src/hotspot/share/ci/ciUtilities.inline.hpp | 1 + src/hotspot/share/classfile/classLoader.inline.hpp | 1 + src/hotspot/share/classfile/classLoaderData.inline.hpp | 1 + src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp | 1 + src/hotspot/share/classfile/javaClasses.inline.hpp | 1 + src/hotspot/share/code/compiledMethod.inline.hpp | 1 + src/hotspot/share/code/oopRecorder.inline.hpp | 1 + src/hotspot/share/code/vmreg.inline.hpp | 3 ++- src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp | 1 + src/hotspot/share/gc/g1/g1Allocator.inline.hpp | 1 + src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp | 1 + src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp | 1 + src/hotspot/share/gc/g1/g1CardTable.inline.hpp | 1 + src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp | 3 ++- src/hotspot/share/gc/g1/g1CommittedRegionMap.inline.hpp | 3 ++- src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp | 3 ++- src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp | 1 + .../gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp | 2 ++ src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp | 3 ++- src/hotspot/share/gc/g1/g1EvacStats.inline.hpp | 1 + src/hotspot/share/gc/g1/g1FullCollector.inline.hpp | 1 + src/hotspot/share/gc/g1/g1FullGCMarker.hpp | 1 + src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp | 3 ++- src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp | 3 ++- src/hotspot/share/gc/g1/g1OopClosures.inline.hpp | 3 ++- src/hotspot/share/gc/g1/g1OopStarChunkedList.inline.hpp | 1 + src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp | 3 ++- src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp | 1 + src/hotspot/share/gc/g1/heapRegion.inline.hpp | 3 ++- src/hotspot/share/gc/g1/heapRegionManager.inline.hpp | 3 ++- src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp | 3 ++- src/hotspot/share/gc/g1/heapRegionSet.inline.hpp | 3 ++- src/hotspot/share/gc/g1/sparsePRT.inline.hpp | 3 ++- src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp | 1 + .../share/gc/parallel/parallelScavengeHeap.inline.hpp | 1 + src/hotspot/share/gc/parallel/psClosure.inline.hpp | 2 ++ .../share/gc/parallel/psCompactionManager.inline.hpp | 3 ++- src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp | 3 ++- src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp | 1 + src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp | 3 ++- src/hotspot/share/gc/parallel/psScavenge.inline.hpp | 3 ++- src/hotspot/share/gc/serial/defNewGeneration.inline.hpp | 1 + src/hotspot/share/gc/serial/markSweep.inline.hpp | 3 ++- src/hotspot/share/gc/serial/serialHeap.inline.hpp | 3 ++- src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp | 1 + src/hotspot/share/gc/shared/ageTable.inline.hpp | 1 + src/hotspot/share/gc/shared/barrierSet.inline.hpp | 1 + src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp | 1 + src/hotspot/share/gc/shared/cardGeneration.inline.hpp | 1 + src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp | 1 + src/hotspot/share/gc/shared/collectedHeap.inline.hpp | 1 + src/hotspot/share/gc/shared/gcLocker.inline.hpp | 1 + src/hotspot/share/gc/shared/gcTraceTime.inline.hpp | 3 ++- src/hotspot/share/gc/shared/gcUtil.inline.hpp | 1 + src/hotspot/share/gc/shared/genOopClosures.inline.hpp | 3 ++- src/hotspot/share/gc/shared/locationPrinter.inline.hpp | 1 + src/hotspot/share/gc/shared/markBitMap.inline.hpp | 3 ++- src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp | 3 ++- src/hotspot/share/gc/shared/oopStorage.inline.hpp | 1 + src/hotspot/share/gc/shared/oopStorageParState.inline.hpp | 3 ++- src/hotspot/share/gc/shared/oopStorageSet.inline.hpp | 3 ++- .../share/gc/shared/oopStorageSetParState.inline.hpp | 3 ++- .../share/gc/shared/partialArrayTaskStepper.inline.hpp | 1 + src/hotspot/share/gc/shared/plab.inline.hpp | 3 ++- src/hotspot/share/gc/shared/preservedMarks.inline.hpp | 1 + src/hotspot/share/gc/shared/referenceProcessor.inline.hpp | 1 + src/hotspot/share/gc/shared/space.inline.hpp | 3 ++- src/hotspot/share/gc/shared/spaceDecorator.inline.hpp | 3 ++- src/hotspot/share/gc/shared/taskqueue.inline.hpp | 1 + .../share/gc/shared/threadLocalAllocBuffer.inline.hpp | 3 ++- src/hotspot/share/gc/shared/weakProcessor.inline.hpp | 3 ++- src/hotspot/share/gc/shared/workerDataArray.inline.hpp | 1 + .../share/gc/shenandoah/shenandoahBarrierSet.inline.hpp | 3 ++- .../gc/shenandoah/shenandoahBarrierSetClone.inline.hpp | 2 ++ src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp | 1 + .../share/gc/shenandoah/shenandoahClosures.inline.hpp | 3 ++- .../share/gc/shenandoah/shenandoahCollectionSet.inline.hpp | 1 + .../share/gc/shenandoah/shenandoahEvacOOMHandler.inline.hpp | 1 + .../share/gc/shenandoah/shenandoahForwarding.inline.hpp | 3 ++- src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp | 3 ++- .../share/gc/shenandoah/shenandoahHeapRegion.inline.hpp | 3 ++- .../share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp | 1 + src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp | 3 ++- .../share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp | 1 + .../share/gc/shenandoah/shenandoahMarkingContext.inline.hpp | 3 ++- .../share/gc/shenandoah/shenandoahNMethod.inline.hpp | 3 ++- .../share/gc/shenandoah/shenandoahOopClosures.inline.hpp | 2 ++ src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp | 1 + src/hotspot/share/gc/shenandoah/shenandoahPadding.hpp | 6 +++--- .../gc/shenandoah/shenandoahParallelCleaning.inline.hpp | 3 ++- .../share/gc/shenandoah/shenandoahRootProcessor.inline.hpp | 3 ++- .../share/gc/shenandoah/shenandoahStringDedup.inline.hpp | 3 ++- .../share/gc/shenandoah/shenandoahTaskqueue.inline.hpp | 3 ++- src/hotspot/share/gc/z/zAbort.inline.hpp | 1 + src/hotspot/share/gc/z/zAddress.inline.hpp | 1 + src/hotspot/share/gc/z/zArray.inline.hpp | 1 + src/hotspot/share/gc/z/zAttachedArray.inline.hpp | 1 + src/hotspot/share/gc/z/zBarrier.inline.hpp | 3 ++- src/hotspot/share/gc/z/zBarrierSet.inline.hpp | 3 ++- src/hotspot/share/gc/z/zBitMap.inline.hpp | 1 + src/hotspot/share/gc/z/zCPU.inline.hpp | 1 + src/hotspot/share/gc/z/zForwarding.inline.hpp | 3 ++- src/hotspot/share/gc/z/zForwardingAllocator.inline.hpp | 1 + src/hotspot/share/gc/z/zForwardingTable.inline.hpp | 3 ++- src/hotspot/share/gc/z/zFuture.inline.hpp | 1 + src/hotspot/share/gc/z/zGranuleMap.inline.hpp | 3 ++- src/hotspot/share/gc/z/zHash.inline.hpp | 2 ++ src/hotspot/share/gc/z/zHeap.inline.hpp | 3 ++- src/hotspot/share/gc/z/zList.inline.hpp | 1 + src/hotspot/share/gc/z/zLiveMap.inline.hpp | 3 ++- src/hotspot/share/gc/z/zLock.inline.hpp | 1 + src/hotspot/share/gc/z/zMark.inline.hpp | 3 ++- src/hotspot/share/gc/z/zMarkCache.inline.hpp | 1 + src/hotspot/share/gc/z/zMarkStack.inline.hpp | 1 + src/hotspot/share/gc/z/zMarkTerminate.inline.hpp | 2 ++ src/hotspot/share/gc/z/zMemory.inline.hpp | 3 ++- src/hotspot/share/gc/z/zMessagePort.inline.hpp | 1 + src/hotspot/share/gc/z/zPage.inline.hpp | 3 ++- src/hotspot/share/gc/z/zPageTable.inline.hpp | 3 ++- src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp | 2 ++ src/hotspot/share/gc/z/zRelocationSet.inline.hpp | 3 ++- src/hotspot/share/gc/z/zRelocationSetSelector.inline.hpp | 3 ++- src/hotspot/share/gc/z/zResurrection.inline.hpp | 1 + src/hotspot/share/gc/z/zSafeDelete.inline.hpp | 3 ++- src/hotspot/share/gc/z/zThread.inline.hpp | 1 + src/hotspot/share/gc/z/zTracer.inline.hpp | 1 + src/hotspot/share/gc/z/zUtils.inline.hpp | 3 ++- src/hotspot/share/gc/z/zValue.inline.hpp | 3 ++- src/hotspot/share/gc/z/zVirtualMemory.inline.hpp | 3 ++- src/hotspot/share/gc/z/zWorkers.inline.hpp | 3 ++- src/hotspot/share/interpreter/bytecode.inline.hpp | 1 + .../share/interpreter/zero/bytecodeInterpreter.inline.hpp | 1 + src/hotspot/share/jfr/leakprofiler/chains/bitset.inline.hpp | 1 + .../jfr/leakprofiler/utilities/unifiedOopRef.inline.hpp | 1 + .../recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp | 1 + .../checkpoint/types/traceid/jfrTraceIdBits.inline.hpp | 1 + .../types/traceid/jfrTraceIdLoadBarrier.inline.hpp | 3 ++- .../share/jfr/recorder/storage/jfrEpochStorage.inline.hpp | 1 + .../share/jfr/recorder/storage/jfrFullStorage.inline.hpp | 3 ++- .../share/jfr/recorder/storage/jfrMemorySpace.inline.hpp | 3 ++- .../share/jfr/recorder/storage/jfrStorageUtils.inline.hpp | 1 + .../jfr/utilities/jfrConcurrentLinkedListHost.inline.hpp | 1 + .../share/jfr/utilities/jfrConcurrentQueue.inline.hpp | 1 + src/hotspot/share/jfr/utilities/jfrEpochQueue.inline.hpp | 3 ++- src/hotspot/share/jfr/utilities/jfrLinkedList.inline.hpp | 1 + src/hotspot/share/jfr/utilities/jfrVersionSystem.inline.hpp | 1 + .../share/jfr/writers/jfrStreamWriterHost.inline.hpp | 1 + src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp | 3 ++- src/hotspot/share/jvmci/jniAccessMark.inline.hpp | 2 ++ src/hotspot/share/memory/allocation.inline.hpp | 2 ++ src/hotspot/share/memory/iterator.inline.hpp | 3 ++- src/hotspot/share/memory/padded.inline.hpp | 3 ++- src/hotspot/share/memory/resourceArea.inline.hpp | 1 + src/hotspot/share/oops/access.inline.hpp | 3 ++- src/hotspot/share/oops/accessBackend.inline.hpp | 3 ++- src/hotspot/share/oops/array.inline.hpp | 4 ++-- src/hotspot/share/oops/arrayKlass.inline.hpp | 3 ++- src/hotspot/share/oops/compiledICHolder.inline.hpp | 1 + src/hotspot/share/oops/compressedOops.inline.hpp | 3 ++- src/hotspot/share/oops/constantPool.inline.hpp | 1 + src/hotspot/share/oops/cpCache.inline.hpp | 1 + src/hotspot/share/oops/fieldStreams.inline.hpp | 1 + src/hotspot/share/oops/instanceClassLoaderKlass.inline.hpp | 3 ++- src/hotspot/share/oops/instanceKlass.inline.hpp | 3 ++- src/hotspot/share/oops/instanceMirrorKlass.inline.hpp | 3 ++- src/hotspot/share/oops/instanceRefKlass.inline.hpp | 3 ++- src/hotspot/share/oops/klass.inline.hpp | 3 ++- src/hotspot/share/oops/markWord.inline.hpp | 3 ++- src/hotspot/share/oops/method.inline.hpp | 1 + src/hotspot/share/oops/methodData.inline.hpp | 1 + src/hotspot/share/oops/objArrayKlass.inline.hpp | 3 ++- src/hotspot/share/oops/objArrayOop.inline.hpp | 3 ++- src/hotspot/share/oops/oop.inline.hpp | 3 ++- src/hotspot/share/oops/oopHandle.inline.hpp | 3 ++- src/hotspot/share/oops/typeArrayKlass.inline.hpp | 3 ++- src/hotspot/share/oops/typeArrayOop.inline.hpp | 3 ++- src/hotspot/share/oops/weakHandle.inline.hpp | 1 + src/hotspot/share/prims/foreign_globals.inline.hpp | 3 ++- src/hotspot/share/prims/jvmtiEnter.inline.hpp | 2 ++ src/hotspot/share/prims/jvmtiEventController.inline.hpp | 1 + src/hotspot/share/prims/jvmtiThreadState.inline.hpp | 1 + src/hotspot/share/prims/whitebox.inline.hpp | 1 + src/hotspot/share/runtime/fieldDescriptor.inline.hpp | 1 + src/hotspot/share/runtime/frame.inline.hpp | 3 ++- src/hotspot/share/runtime/handles.inline.hpp | 1 + src/hotspot/share/runtime/interfaceSupport.inline.hpp | 2 ++ src/hotspot/share/runtime/jniHandles.inline.hpp | 3 ++- src/hotspot/share/runtime/objectMonitor.inline.hpp | 3 ++- src/hotspot/share/runtime/perfData.inline.hpp | 1 + src/hotspot/share/runtime/prefetch.inline.hpp | 1 + src/hotspot/share/runtime/safefetch.inline.hpp | 2 ++ src/hotspot/share/runtime/safepointMechanism.inline.hpp | 3 ++- src/hotspot/share/runtime/semaphore.inline.hpp | 3 ++- src/hotspot/share/runtime/stackFrameStream.inline.hpp | 3 ++- src/hotspot/share/runtime/stackWatermark.inline.hpp | 3 ++- src/hotspot/share/runtime/stackWatermarkSet.inline.hpp | 3 ++- src/hotspot/share/runtime/thread.inline.hpp | 5 +++-- src/hotspot/share/runtime/threadSMR.inline.hpp | 3 ++- src/hotspot/share/runtime/threadWXSetters.inline.hpp | 2 ++ src/hotspot/share/runtime/vframe.inline.hpp | 3 ++- src/hotspot/share/services/mallocTracker.inline.hpp | 1 + src/hotspot/share/utilities/bitMap.inline.hpp | 3 ++- src/hotspot/share/utilities/concurrentHashTable.inline.hpp | 3 ++- .../share/utilities/concurrentHashTableTasks.inline.hpp | 2 ++ src/hotspot/share/utilities/filterQueue.inline.hpp | 1 + src/hotspot/share/utilities/globalCounter.inline.hpp | 3 ++- src/hotspot/share/utilities/hashtable.inline.hpp | 3 ++- src/hotspot/share/utilities/lockFreeQueue.inline.hpp | 3 ++- src/hotspot/share/utilities/stack.inline.hpp | 3 ++- 242 files changed, 372 insertions(+), 141 deletions(-) diff --git a/doc/hotspot-style.html b/doc/hotspot-style.html index 882f608450f..b0c22caf00f 100644 --- a/doc/hotspot-style.html +++ b/doc/hotspot-style.html @@ -94,6 +94,7 @@

  • All source files must have a globally unique basename. The build system depends on this uniqueness.

  • Do not put non-trivial function implementations in .hpp files. If the implementation depends on other .hpp files, put it in a .cpp or a .inline.hpp file.

  • .inline.hpp files should only be included in .cpp or .inline.hpp files.

    • +

  • All .inline.hpp files should include their corresponding .hpp file as the first include line. Declarations needed by other files should be put in the .hpp file, and not in the .inline.hpp file. This rule exists to resolve problems with circular dependencies between .inline.hpp files.

  • All .cpp files include precompiled.hpp as the first include line.

  • precompiled.hpp is just a build time optimization, so don't rely on it to resolve include problems.

  • Keep the include lines alphabetically sorted.

    • diff --git a/doc/hotspot-style.md b/doc/hotspot-style.md index c5a0eb9a681..e631033c78f 100644 --- a/doc/hotspot-style.md +++ b/doc/hotspot-style.md @@ -138,6 +138,11 @@ a .inline.hpp file. * .inline.hpp files should only be included in .cpp or .inline.hpp files. +* All .inline.hpp files should include their corresponding .hpp file as +the first include line. Declarations needed by other files should be put +in the .hpp file, and not in the .inline.hpp file. This rule exists to +resolve problems with circular dependencies between .inline.hpp files. + * All .cpp files include precompiled.hpp as the first include line. * precompiled.hpp is just a build time optimization, so don't rely on diff --git a/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp b/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp index 4a2285b392f..acef8d21abc 100644 --- a/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp @@ -24,8 +24,8 @@ */ #include "precompiled.hpp" +#include "asm/assembler.inline.hpp" #include "asm/macroAssembler.inline.hpp" -#include "assembler_aarch64.inline.hpp" #include "code/vtableStubs.hpp" #include "interp_masm_aarch64.hpp" #include "memory/resourceArea.hpp" diff --git a/src/hotspot/cpu/arm/icBuffer_arm.cpp b/src/hotspot/cpu/arm/icBuffer_arm.cpp index 03a53ec19bb..e3a1c148ec6 100644 --- a/src/hotspot/cpu/arm/icBuffer_arm.cpp +++ b/src/hotspot/cpu/arm/icBuffer_arm.cpp @@ -23,8 +23,7 @@ */ #include "precompiled.hpp" -#include "asm/assembler.hpp" -#include "assembler_arm.inline.hpp" +#include "asm/assembler.inline.hpp" #include "code/icBuffer.hpp" #include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/bytecodes.hpp" diff --git a/src/hotspot/cpu/arm/icache_arm.cpp b/src/hotspot/cpu/arm/icache_arm.cpp index 7f258ab8b27..61fcb8a3580 100644 --- a/src/hotspot/cpu/arm/icache_arm.cpp +++ b/src/hotspot/cpu/arm/icache_arm.cpp @@ -23,8 +23,8 @@ */ #include "precompiled.hpp" +#include "asm/assembler.inline.hpp" #include "asm/macroAssembler.hpp" -#include "assembler_arm.inline.hpp" #include "runtime/icache.hpp" #define __ _masm-> diff --git a/src/hotspot/cpu/arm/jniFastGetField_arm.cpp b/src/hotspot/cpu/arm/jniFastGetField_arm.cpp index f333df57902..22f09392317 100644 --- a/src/hotspot/cpu/arm/jniFastGetField_arm.cpp +++ b/src/hotspot/cpu/arm/jniFastGetField_arm.cpp @@ -23,8 +23,8 @@ */ #include "precompiled.hpp" +#include "asm/assembler.inline.hpp" #include "asm/macroAssembler.hpp" -#include "assembler_arm.inline.hpp" #include "code/codeBlob.hpp" #include "memory/resourceArea.hpp" #include "prims/jniFastGetField.hpp" diff --git a/src/hotspot/cpu/arm/nativeInst_arm_32.cpp b/src/hotspot/cpu/arm/nativeInst_arm_32.cpp index 77694f6bfc9..9f2a0c7430c 100644 --- a/src/hotspot/cpu/arm/nativeInst_arm_32.cpp +++ b/src/hotspot/cpu/arm/nativeInst_arm_32.cpp @@ -23,7 +23,7 @@ */ #include "precompiled.hpp" -#include "assembler_arm.inline.hpp" +#include "asm/assembler.inline.hpp" #include "code/codeCache.hpp" #include "memory/resourceArea.hpp" #include "nativeInst_arm.hpp" diff --git a/src/hotspot/cpu/arm/relocInfo_arm.cpp b/src/hotspot/cpu/arm/relocInfo_arm.cpp index 2b694d75339..15deaf7d2f3 100644 --- a/src/hotspot/cpu/arm/relocInfo_arm.cpp +++ b/src/hotspot/cpu/arm/relocInfo_arm.cpp @@ -24,7 +24,6 @@ #include "precompiled.hpp" #include "asm/assembler.inline.hpp" -#include "assembler_arm.inline.hpp" #include "code/relocInfo.hpp" #include "nativeInst_arm.hpp" #include "oops/compressedOops.inline.hpp" diff --git a/src/hotspot/cpu/arm/runtime_arm.cpp b/src/hotspot/cpu/arm/runtime_arm.cpp index 17f7bbb3395..e39fe8f3eb1 100644 --- a/src/hotspot/cpu/arm/runtime_arm.cpp +++ b/src/hotspot/cpu/arm/runtime_arm.cpp @@ -24,8 +24,7 @@ #include "precompiled.hpp" #ifdef COMPILER2 -#include "asm/assembler.hpp" -#include "assembler_arm.inline.hpp" +#include "asm/assembler.inline.hpp" #include "code/vmreg.hpp" #include "compiler/oopMap.hpp" #include "interpreter/interpreter.hpp" diff --git a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp index 027ffd29c2d..a531399f563 100644 --- a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp +++ b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp @@ -23,8 +23,7 @@ */ #include "precompiled.hpp" -#include "asm/assembler.hpp" -#include "assembler_arm.inline.hpp" +#include "asm/assembler.inline.hpp" #include "code/debugInfoRec.hpp" #include "code/icBuffer.hpp" #include "code/vtableStubs.hpp" diff --git a/src/hotspot/cpu/arm/stubGenerator_arm.cpp b/src/hotspot/cpu/arm/stubGenerator_arm.cpp index 3b5662862bd..e9ebb14a9c9 100644 --- a/src/hotspot/cpu/arm/stubGenerator_arm.cpp +++ b/src/hotspot/cpu/arm/stubGenerator_arm.cpp @@ -23,8 +23,7 @@ */ #include "precompiled.hpp" -#include "asm/assembler.hpp" -#include "assembler_arm.inline.hpp" +#include "asm/assembler.inline.hpp" #include "compiler/oopMap.hpp" #include "gc/shared/barrierSet.hpp" #include "gc/shared/barrierSetAssembler.hpp" diff --git a/src/hotspot/cpu/arm/vtableStubs_arm.cpp b/src/hotspot/cpu/arm/vtableStubs_arm.cpp index f0a4352671f..20f4b7c56f9 100644 --- a/src/hotspot/cpu/arm/vtableStubs_arm.cpp +++ b/src/hotspot/cpu/arm/vtableStubs_arm.cpp @@ -23,9 +23,8 @@ */ #include "precompiled.hpp" -#include "asm/assembler.hpp" +#include "asm/assembler.inline.hpp" #include "asm/macroAssembler.inline.hpp" -#include "assembler_arm.inline.hpp" #include "code/vtableStubs.hpp" #include "interp_masm_arm.hpp" #include "memory/resourceArea.hpp" diff --git a/src/hotspot/cpu/ppc/icBuffer_ppc.cpp b/src/hotspot/cpu/ppc/icBuffer_ppc.cpp index 6e2c34341a5..4157a5b0fd7 100644 --- a/src/hotspot/cpu/ppc/icBuffer_ppc.cpp +++ b/src/hotspot/cpu/ppc/icBuffer_ppc.cpp @@ -24,8 +24,7 @@ */ #include "precompiled.hpp" -#include "asm/assembler.hpp" -#include "assembler_ppc.inline.hpp" +#include "asm/assembler.inline.hpp" #include "code/icBuffer.hpp" #include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/bytecodes.hpp" diff --git a/src/hotspot/cpu/zero/assembler_zero.cpp b/src/hotspot/cpu/zero/assembler_zero.cpp index 706e020123a..693ff06ca54 100644 --- a/src/hotspot/cpu/zero/assembler_zero.cpp +++ b/src/hotspot/cpu/zero/assembler_zero.cpp @@ -24,7 +24,7 @@ */ #include "precompiled.hpp" -#include "assembler_zero.inline.hpp" +#include "asm/assembler.inline.hpp" #include "gc/shared/cardTableBarrierSet.hpp" #include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/interpreter.hpp" diff --git a/src/hotspot/cpu/zero/icBuffer_zero.cpp b/src/hotspot/cpu/zero/icBuffer_zero.cpp index 8e28fa6eacc..64b273c908c 100644 --- a/src/hotspot/cpu/zero/icBuffer_zero.cpp +++ b/src/hotspot/cpu/zero/icBuffer_zero.cpp @@ -24,8 +24,7 @@ */ #include "precompiled.hpp" -#include "asm/assembler.hpp" -#include "assembler_zero.inline.hpp" +#include "asm/assembler.inline.hpp" #include "code/icBuffer.hpp" #include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/bytecodes.hpp" diff --git a/src/hotspot/cpu/zero/icache_zero.cpp b/src/hotspot/cpu/zero/icache_zero.cpp index b37465016dd..3b255befd55 100644 --- a/src/hotspot/cpu/zero/icache_zero.cpp +++ b/src/hotspot/cpu/zero/icache_zero.cpp @@ -24,7 +24,7 @@ */ #include "precompiled.hpp" -#include "assembler_zero.inline.hpp" +#include "asm/assembler.inline.hpp" #include "runtime/icache.hpp" void ICacheStubGenerator::generate_icache_flush( diff --git a/src/hotspot/cpu/zero/jniFastGetField_zero.cpp b/src/hotspot/cpu/zero/jniFastGetField_zero.cpp index d37ed807b69..dea7d7c3b83 100644 --- a/src/hotspot/cpu/zero/jniFastGetField_zero.cpp +++ b/src/hotspot/cpu/zero/jniFastGetField_zero.cpp @@ -24,7 +24,7 @@ */ #include "precompiled.hpp" -#include "assembler_zero.inline.hpp" +#include "asm/assembler.inline.hpp" #include "memory/resourceArea.hpp" #include "prims/jniFastGetField.hpp" #include "prims/jvm_misc.hpp" diff --git a/src/hotspot/cpu/zero/nativeInst_zero.cpp b/src/hotspot/cpu/zero/nativeInst_zero.cpp index 148f6084be2..c26a4245c2c 100644 --- a/src/hotspot/cpu/zero/nativeInst_zero.cpp +++ b/src/hotspot/cpu/zero/nativeInst_zero.cpp @@ -24,7 +24,7 @@ */ #include "precompiled.hpp" -#include "assembler_zero.inline.hpp" +#include "asm/assembler.inline.hpp" #include "entry_zero.hpp" #include "interpreter/zero/zeroInterpreter.hpp" #include "nativeInst_zero.hpp" diff --git a/src/hotspot/cpu/zero/sharedRuntime_zero.cpp b/src/hotspot/cpu/zero/sharedRuntime_zero.cpp index efe82a0cce3..5d46dc2e5f8 100644 --- a/src/hotspot/cpu/zero/sharedRuntime_zero.cpp +++ b/src/hotspot/cpu/zero/sharedRuntime_zero.cpp @@ -24,8 +24,7 @@ */ #include "precompiled.hpp" -#include "asm/assembler.hpp" -#include "assembler_zero.inline.hpp" +#include "asm/assembler.inline.hpp" #include "code/debugInfoRec.hpp" #include "code/icBuffer.hpp" #include "code/vtableStubs.hpp" diff --git a/src/hotspot/cpu/zero/stubGenerator_zero.cpp b/src/hotspot/cpu/zero/stubGenerator_zero.cpp index 3f9c484e7aa..d4f52d576d8 100644 --- a/src/hotspot/cpu/zero/stubGenerator_zero.cpp +++ b/src/hotspot/cpu/zero/stubGenerator_zero.cpp @@ -24,8 +24,7 @@ */ #include "precompiled.hpp" -#include "asm/assembler.hpp" -#include "assembler_zero.inline.hpp" +#include "asm/assembler.inline.hpp" #include "interpreter/interpreter.hpp" #include "nativeInst_zero.hpp" #include "oops/instanceOop.hpp" diff --git a/src/hotspot/cpu/zero/vm_version_zero.cpp b/src/hotspot/cpu/zero/vm_version_zero.cpp index dae849ef526..14368bed5a0 100644 --- a/src/hotspot/cpu/zero/vm_version_zero.cpp +++ b/src/hotspot/cpu/zero/vm_version_zero.cpp @@ -24,7 +24,7 @@ */ #include "precompiled.hpp" -#include "assembler_zero.inline.hpp" +#include "asm/assembler.inline.hpp" #include "memory/resourceArea.hpp" #include "runtime/arguments.hpp" #include "runtime/globals_extension.hpp" diff --git a/src/hotspot/os/aix/os_aix.inline.hpp b/src/hotspot/os/aix/os_aix.inline.hpp index e53bdd74bf6..c0ec5faa564 100644 --- a/src/hotspot/os/aix/os_aix.inline.hpp +++ b/src/hotspot/os/aix/os_aix.inline.hpp @@ -26,6 +26,8 @@ #ifndef OS_AIX_OS_AIX_INLINE_HPP #define OS_AIX_OS_AIX_INLINE_HPP +// os_aix.hpp included by os.hpp + #include "runtime/os.hpp" #include "os_posix.inline.hpp" diff --git a/src/hotspot/os/bsd/os_bsd.inline.hpp b/src/hotspot/os/bsd/os_bsd.inline.hpp index 32921602ee8..0b9fc65b0d8 100644 --- a/src/hotspot/os/bsd/os_bsd.inline.hpp +++ b/src/hotspot/os/bsd/os_bsd.inline.hpp @@ -25,6 +25,8 @@ #ifndef OS_BSD_OS_BSD_INLINE_HPP #define OS_BSD_OS_BSD_INLINE_HPP +// os_bsd.hpp included by os.hpp + #include "runtime/os.hpp" #include "os_posix.inline.hpp" diff --git a/src/hotspot/os/linux/os_linux.inline.hpp b/src/hotspot/os/linux/os_linux.inline.hpp index 4b038c9c72c..7cbb72eed65 100644 --- a/src/hotspot/os/linux/os_linux.inline.hpp +++ b/src/hotspot/os/linux/os_linux.inline.hpp @@ -25,6 +25,8 @@ #ifndef OS_LINUX_OS_LINUX_INLINE_HPP #define OS_LINUX_OS_LINUX_INLINE_HPP +// os_linux.hpp included by os.hpp + #include "runtime/os.hpp" #include "os_posix.inline.hpp" diff --git a/src/hotspot/os/posix/os_posix.inline.hpp b/src/hotspot/os/posix/os_posix.inline.hpp index 33ee5da3bc9..88ac176f67c 100644 --- a/src/hotspot/os/posix/os_posix.inline.hpp +++ b/src/hotspot/os/posix/os_posix.inline.hpp @@ -25,6 +25,8 @@ #ifndef OS_POSIX_OS_POSIX_INLINE_HPP #define OS_POSIX_OS_POSIX_INLINE_HPP +// os_posix.hpp included by os.hpp + #include "runtime/os.hpp" #include diff --git a/src/hotspot/os/windows/os_windows.inline.hpp b/src/hotspot/os/windows/os_windows.inline.hpp index 70c8246ec98..8dab6f44180 100644 --- a/src/hotspot/os/windows/os_windows.inline.hpp +++ b/src/hotspot/os/windows/os_windows.inline.hpp @@ -25,6 +25,8 @@ #ifndef OS_WINDOWS_OS_WINDOWS_INLINE_HPP #define OS_WINDOWS_OS_WINDOWS_INLINE_HPP +// os_windows.hpp included by os.hpp + #include "runtime/os.hpp" #include "runtime/thread.hpp" diff --git a/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp index df96bb859f4..a9fda1d4b75 100644 --- a/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp +++ b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp @@ -30,7 +30,7 @@ // no precompiled headers #include "jvm.h" -#include "assembler_zero.inline.hpp" +#include "asm/assembler.inline.hpp" #include "classfile/vmSymbols.hpp" #include "code/icBuffer.hpp" #include "code/vtableStubs.hpp" diff --git a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp index 3957be6263c..6fc0c840642 100644 --- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp +++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp @@ -24,7 +24,7 @@ // no precompiled headers #include "jvm.h" -#include "assembler_arm.inline.hpp" +#include "asm/assembler.inline.hpp" #include "classfile/vmSymbols.hpp" #include "code/icBuffer.hpp" #include "code/vtableStubs.hpp" diff --git a/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp b/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp index ebc7b8b75fb..0360bcb6943 100644 --- a/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp +++ b/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp @@ -25,7 +25,7 @@ // no precompiled headers #include "jvm.h" -#include "assembler_zero.inline.hpp" +#include "asm/assembler.inline.hpp" #include "classfile/vmSymbols.hpp" #include "code/icBuffer.hpp" #include "code/vtableStubs.hpp" diff --git a/src/hotspot/share/asm/macroAssembler.inline.hpp b/src/hotspot/share/asm/macroAssembler.inline.hpp index bd62f82e4ac..c93e2f89c36 100644 --- a/src/hotspot/share/asm/macroAssembler.inline.hpp +++ b/src/hotspot/share/asm/macroAssembler.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_ASM_MACROASSEMBLER_INLINE_HPP #include "asm/macroAssembler.hpp" + #include CPU_HEADER_INLINE(macroAssembler) #endif // SHARE_ASM_MACROASSEMBLER_INLINE_HPP diff --git a/src/hotspot/share/c1/c1_ValueSet.inline.hpp b/src/hotspot/share/c1/c1_ValueSet.inline.hpp index 026c9f3c62d..4daed86b561 100644 --- a/src/hotspot/share/c1/c1_ValueSet.inline.hpp +++ b/src/hotspot/share/c1/c1_ValueSet.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_C1_C1_VALUESET_INLINE_HPP #define SHARE_C1_C1_VALUESET_INLINE_HPP -#include "c1/c1_Instruction.hpp" #include "c1/c1_ValueSet.hpp" + +#include "c1/c1_Instruction.hpp" #include "utilities/bitMap.inline.hpp" inline ValueSet::ValueSet() : _map(Instruction::number_of_instructions()) { diff --git a/src/hotspot/share/cds/archiveUtils.inline.hpp b/src/hotspot/share/cds/archiveUtils.inline.hpp index 81d5a9243d7..ac9ac0edfc7 100644 --- a/src/hotspot/share/cds/archiveUtils.inline.hpp +++ b/src/hotspot/share/cds/archiveUtils.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_CDS_ARCHIVEUTILS_INLINE_HPP #include "cds/archiveUtils.hpp" + #include "utilities/bitMap.inline.hpp" inline bool SharedDataRelocator::do_bit(size_t offset) { diff --git a/src/hotspot/share/cds/heapShared.inline.hpp b/src/hotspot/share/cds/heapShared.inline.hpp index 679dbc714c3..c3eeee060d4 100644 --- a/src/hotspot/share/cds/heapShared.inline.hpp +++ b/src/hotspot/share/cds/heapShared.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_CDS_HEAPSHARED_INLINE_HPP #include "cds/heapShared.hpp" + #include "gc/shared/collectedHeap.inline.hpp" #include "oops/compressedOops.inline.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/share/ci/ciUtilities.inline.hpp b/src/hotspot/share/ci/ciUtilities.inline.hpp index c67c47acaba..05e73d8ca64 100644 --- a/src/hotspot/share/ci/ciUtilities.inline.hpp +++ b/src/hotspot/share/ci/ciUtilities.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_CI_CIUTILITIES_INLINE_HPP #include "ci/ciUtilities.hpp" + #include "runtime/interfaceSupport.inline.hpp" // Add a ci native entry wrapper? diff --git a/src/hotspot/share/classfile/classLoader.inline.hpp b/src/hotspot/share/classfile/classLoader.inline.hpp index aa362f3112c..183024252cd 100644 --- a/src/hotspot/share/classfile/classLoader.inline.hpp +++ b/src/hotspot/share/classfile/classLoader.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_CLASSFILE_CLASSLOADER_INLINE_HPP #include "classfile/classLoader.hpp" + #include "runtime/atomic.hpp" #include "runtime/arguments.hpp" diff --git a/src/hotspot/share/classfile/classLoaderData.inline.hpp b/src/hotspot/share/classfile/classLoaderData.inline.hpp index c81cbb76dba..842843a8d32 100644 --- a/src/hotspot/share/classfile/classLoaderData.inline.hpp +++ b/src/hotspot/share/classfile/classLoaderData.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_CLASSFILE_CLASSLOADERDATA_INLINE_HPP #include "classfile/classLoaderData.hpp" + #include "classfile/javaClasses.hpp" #include "oops/instanceKlass.hpp" #include "oops/oop.inline.hpp" diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp b/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp index bd303d5cd9c..9e93c4ef926 100644 --- a/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp +++ b/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP #include "classfile/classLoaderDataGraph.hpp" + #include "classfile/javaClasses.hpp" #include "oops/oop.inline.hpp" #include "runtime/atomic.hpp" diff --git a/src/hotspot/share/classfile/javaClasses.inline.hpp b/src/hotspot/share/classfile/javaClasses.inline.hpp index eea84ae5829..44c01054566 100644 --- a/src/hotspot/share/classfile/javaClasses.inline.hpp +++ b/src/hotspot/share/classfile/javaClasses.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_CLASSFILE_JAVACLASSES_INLINE_HPP #include "classfile/javaClasses.hpp" + #include "oops/access.inline.hpp" #include "oops/method.hpp" #include "oops/oop.inline.hpp" diff --git a/src/hotspot/share/code/compiledMethod.inline.hpp b/src/hotspot/share/code/compiledMethod.inline.hpp index 670a2ae2a65..30b5d0b67c6 100644 --- a/src/hotspot/share/code/compiledMethod.inline.hpp +++ b/src/hotspot/share/code/compiledMethod.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_CODE_COMPILEDMETHOD_INLINE_HPP #include "code/compiledMethod.hpp" + #include "code/nativeInst.hpp" #include "runtime/atomic.hpp" #include "runtime/frame.hpp" diff --git a/src/hotspot/share/code/oopRecorder.inline.hpp b/src/hotspot/share/code/oopRecorder.inline.hpp index 10a1c260206..0e05c91fea1 100644 --- a/src/hotspot/share/code/oopRecorder.inline.hpp +++ b/src/hotspot/share/code/oopRecorder.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_CODE_OOPRECORDER_INLINE_HPP #include "code/oopRecorder.hpp" + #include "memory/universe.hpp" template diff --git a/src/hotspot/share/code/vmreg.inline.hpp b/src/hotspot/share/code/vmreg.inline.hpp index ad6f5af4170..5c33aa76aec 100644 --- a/src/hotspot/share/code/vmreg.inline.hpp +++ b/src/hotspot/share/code/vmreg.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_CODE_VMREG_INLINE_HPP #define SHARE_CODE_VMREG_INLINE_HPP -#include "asm/register.hpp" #include "code/vmreg.hpp" + +#include "asm/register.hpp" #include CPU_HEADER_INLINE(vmreg) #endif // SHARE_CODE_VMREG_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp index 79fb4862490..e5209c7ddd8 100644 --- a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp +++ b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_G1_G1ALLOCREGION_INLINE_HPP #include "gc/g1/g1AllocRegion.hpp" + #include "gc/g1/heapRegion.inline.hpp" #define assert_alloc_region(p, message) \ diff --git a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp index 73a07828378..d8bf16ef1ce 100644 --- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp +++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_G1_G1ALLOCATOR_INLINE_HPP #include "gc/g1/g1Allocator.hpp" + #include "gc/g1/g1AllocRegion.inline.hpp" #include "gc/shared/plab.inline.hpp" #include "memory/universe.hpp" diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp index 188f3b0fd25..8fa29544ca4 100644 --- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp +++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_G1_G1BARRIERSET_INLINE_HPP #include "gc/g1/g1BarrierSet.hpp" + #include "gc/g1/g1CardTable.hpp" #include "gc/shared/accessBarrierSupport.inline.hpp" #include "oops/access.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp index f88319eccb3..74b0cb2818e 100644 --- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp +++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP #include "gc/g1/g1BlockOffsetTable.hpp" + #include "gc/g1/heapRegion.hpp" #include "gc/shared/memset_with_concurrent_readers.hpp" #include "runtime/atomic.hpp" diff --git a/src/hotspot/share/gc/g1/g1CardTable.inline.hpp b/src/hotspot/share/gc/g1/g1CardTable.inline.hpp index 997c2c821ef..7291ba83083 100644 --- a/src/hotspot/share/gc/g1/g1CardTable.inline.hpp +++ b/src/hotspot/share/gc/g1/g1CardTable.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_G1_G1CARDTABLE_INLINE_HPP #include "gc/g1/g1CardTable.hpp" + #include "gc/g1/heapRegion.hpp" inline uint G1CardTable::region_idx_for(CardValue* p) { diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp index df1b3acadb7..7d3ef7041d9 100644 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_GC_G1_G1COLLECTEDHEAP_INLINE_HPP #define SHARE_GC_G1_G1COLLECTEDHEAP_INLINE_HPP -#include "gc/g1/g1BarrierSet.hpp" #include "gc/g1/g1CollectedHeap.hpp" + +#include "gc/g1/g1BarrierSet.hpp" #include "gc/g1/g1CollectorState.hpp" #include "gc/g1/g1Policy.hpp" #include "gc/g1/g1RemSet.hpp" diff --git a/src/hotspot/share/gc/g1/g1CommittedRegionMap.inline.hpp b/src/hotspot/share/gc/g1/g1CommittedRegionMap.inline.hpp index 0eb90659a88..f00cc9a1fba 100644 --- a/src/hotspot/share/gc/g1/g1CommittedRegionMap.inline.hpp +++ b/src/hotspot/share/gc/g1/g1CommittedRegionMap.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_G1_G1COMMITTEDREGIONMAP_INLINE_HPP #include "gc/g1/g1CommittedRegionMap.hpp" + #include "utilities/bitMap.inline.hpp" inline bool G1CommittedRegionMap::active(uint index) const { @@ -36,4 +37,4 @@ inline bool G1CommittedRegionMap::inactive(uint index) const { return _inactive.at(index); } -#endif // SHARE_GC_G1_G1COMMITTEDREGIONMAP_INLINE_HPP \ No newline at end of file +#endif // SHARE_GC_G1_G1COMMITTEDREGIONMAP_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp index bd797e6eb9c..8bb5e52ce06 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_GC_G1_G1CONCURRENTMARK_INLINE_HPP #define SHARE_GC_G1_G1CONCURRENTMARK_INLINE_HPP -#include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1ConcurrentMark.hpp" + +#include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp" #include "gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp" #include "gc/g1/g1OopClosures.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp index d45f3b0263a..ea542bec7a8 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP #include "gc/g1/g1ConcurrentMarkBitMap.hpp" + #include "gc/shared/markBitMap.inline.hpp" #include "memory/memRegion.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp index 3cf69f2b034..d72711c73f7 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp @@ -25,6 +25,8 @@ #ifndef SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP #define SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP +#include "gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp" + #include "oops/oop.inline.hpp" #include "oops/oopsHierarchy.hpp" #include "runtime/globals.hpp" diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp index ee707cda226..ce0944314e3 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP #define SHARE_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP -#include "gc/g1/g1ConcurrentMark.hpp" #include "gc/g1/g1ConcurrentMarkThread.hpp" +#include "gc/g1/g1ConcurrentMark.hpp" + // Total virtual time so far. inline double G1ConcurrentMarkThread::vtime_accum() { return _vtime_accum + _cm->all_task_accum_vtime(); diff --git a/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp b/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp index 08114388bc6..9ebc1dd57a8 100644 --- a/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp +++ b/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_G1_G1EVACSTATS_INLINE_HPP #include "gc/g1/g1EvacStats.hpp" + #include "runtime/atomic.hpp" inline void G1EvacStats::add_direct_allocated(size_t value) { diff --git a/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp b/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp index b08f7f6db7d..69b48a123fd 100644 --- a/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp +++ b/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_G1_G1FULLCOLLECTOR_INLINE_HPP #include "gc/g1/g1FullCollector.hpp" + #include "gc/g1/g1FullGCHeapRegionAttr.hpp" #include "oops/oopsHierarchy.hpp" diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.hpp b/src/hotspot/share/gc/g1/g1FullGCMarker.hpp index 6d6e08f83ca..ec7f029b7ce 100644 --- a/src/hotspot/share/gc/g1/g1FullGCMarker.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCMarker.hpp @@ -46,6 +46,7 @@ typedef GenericTaskQueueSet ObjArrayTaskQueueSet; class G1CMBitMap; class G1FullCollector; +class TaskTerminator; class G1FullGCMarker : public CHeapObj { G1FullCollector* _collector; diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp index a99f546bd60..992cbb2321c 100644 --- a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp @@ -25,12 +25,13 @@ #ifndef SHARE_GC_G1_G1FULLGCMARKER_INLINE_HPP #define SHARE_GC_G1_G1FULLGCMARKER_INLINE_HPP +#include "gc/g1/g1FullGCMarker.hpp" + #include "classfile/classLoaderData.hpp" #include "classfile/javaClasses.inline.hpp" #include "gc/g1/g1Allocator.inline.hpp" #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp" #include "gc/g1/g1FullCollector.inline.hpp" -#include "gc/g1/g1FullGCMarker.hpp" #include "gc/g1/g1FullGCOopClosures.inline.hpp" #include "gc/g1/g1RegionMarkStatsCache.hpp" #include "gc/g1/g1StringDedup.hpp" diff --git a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp index 9da68966c27..6ed5385dd6c 100644 --- a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp @@ -25,11 +25,12 @@ #ifndef SHARE_GC_G1_G1FULLGCOOPCLOSURES_INLINE_HPP #define SHARE_GC_G1_G1FULLGCOOPCLOSURES_INLINE_HPP +#include "gc/g1/g1FullGCOopClosures.hpp" + #include "gc/g1/g1Allocator.inline.hpp" #include "gc/g1/g1FullCollector.inline.hpp" #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp" #include "gc/g1/g1FullGCMarker.inline.hpp" -#include "gc/g1/g1FullGCOopClosures.hpp" #include "gc/g1/heapRegionRemSet.hpp" #include "memory/iterator.inline.hpp" #include "memory/universe.hpp" diff --git a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp index e1790bdf657..d5bfadb545b 100644 --- a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp +++ b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_G1_G1OOPCLOSURES_INLINE_HPP #define SHARE_GC_G1_G1OOPCLOSURES_INLINE_HPP +#include "gc/g1/g1OopClosures.hpp" + #include "gc/g1/g1CollectedHeap.hpp" #include "gc/g1/g1ConcurrentMark.inline.hpp" -#include "gc/g1/g1OopClosures.hpp" #include "gc/g1/g1ParScanThreadState.inline.hpp" #include "gc/g1/g1RemSet.hpp" #include "gc/g1/heapRegion.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1OopStarChunkedList.inline.hpp b/src/hotspot/share/gc/g1/g1OopStarChunkedList.inline.hpp index 4872495440f..9fc33f4eef0 100644 --- a/src/hotspot/share/gc/g1/g1OopStarChunkedList.inline.hpp +++ b/src/hotspot/share/gc/g1/g1OopStarChunkedList.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_G1_G1OOPSTARCHUNKEDLIST_INLINE_HPP #include "gc/g1/g1OopStarChunkedList.hpp" + #include "gc/g1/g1CollectedHeap.inline.hpp" #include "memory/allocation.inline.hpp" #include "memory/iterator.hpp" diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp index 7bfaf855b4c..db117c50611 100644 --- a/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp +++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP #define SHARE_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP +#include "gc/g1/g1ParScanThreadState.hpp" + #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1OopStarChunkedList.inline.hpp" -#include "gc/g1/g1ParScanThreadState.hpp" #include "gc/g1/g1RemSet.hpp" #include "oops/access.inline.hpp" #include "oops/oop.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp index d5e4bc0ab0e..76679e2164d 100644 --- a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp +++ b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP #include "gc/g1/g1RegionMarkStatsCache.hpp" + #include "runtime/atomic.hpp" inline G1RegionMarkStatsCache::G1RegionMarkStatsCacheEntry* G1RegionMarkStatsCache::find_for_add(uint region_idx) { diff --git a/src/hotspot/share/gc/g1/heapRegion.inline.hpp b/src/hotspot/share/gc/g1/heapRegion.inline.hpp index b6e9b4466a8..8cce9ae0ba2 100644 --- a/src/hotspot/share/gc/g1/heapRegion.inline.hpp +++ b/src/hotspot/share/gc/g1/heapRegion.inline.hpp @@ -25,11 +25,12 @@ #ifndef SHARE_GC_G1_HEAPREGION_INLINE_HPP #define SHARE_GC_G1_HEAPREGION_INLINE_HPP +#include "gc/g1/heapRegion.hpp" + #include "gc/g1/g1BlockOffsetTable.inline.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp" #include "gc/g1/g1Predictions.hpp" -#include "gc/g1/heapRegion.hpp" #include "oops/oop.inline.hpp" #include "runtime/atomic.hpp" #include "runtime/prefetch.inline.hpp" diff --git a/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp b/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp index d32f25a0db4..95fd008f2d3 100644 --- a/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp +++ b/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_G1_HEAPREGIONMANAGER_INLINE_HPP #define SHARE_GC_G1_HEAPREGIONMANAGER_INLINE_HPP +#include "gc/g1/heapRegionManager.hpp" + #include "gc/g1/g1CommittedRegionMap.inline.hpp" #include "gc/g1/heapRegion.hpp" -#include "gc/g1/heapRegionManager.hpp" #include "gc/g1/heapRegionSet.inline.hpp" inline bool HeapRegionManager::is_available(uint region) const { diff --git a/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp b/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp index cfc4e20eddc..b85770c7af8 100644 --- a/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp +++ b/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_VM_GC_G1_HEAPREGIONREMSET_INLINE_HPP #define SHARE_VM_GC_G1_HEAPREGIONREMSET_INLINE_HPP -#include "gc/g1/heapRegion.inline.hpp" #include "gc/g1/heapRegionRemSet.hpp" + +#include "gc/g1/heapRegion.inline.hpp" #include "gc/g1/sparsePRT.hpp" #include "runtime/atomic.hpp" #include "utilities/bitMap.inline.hpp" diff --git a/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp b/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp index 6e34c6a60cb..1f509ff3e31 100644 --- a/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp +++ b/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_G1_HEAPREGIONSET_INLINE_HPP #define SHARE_GC_G1_HEAPREGIONSET_INLINE_HPP -#include "gc/g1/g1NUMA.hpp" #include "gc/g1/heapRegionSet.hpp" +#include "gc/g1/g1NUMA.hpp" + inline void HeapRegionSetBase::add(HeapRegion* hr) { check_mt_safety(); assert_heap_region_set(hr->containing_set() == NULL, "should not already have a containing set"); diff --git a/src/hotspot/share/gc/g1/sparsePRT.inline.hpp b/src/hotspot/share/gc/g1/sparsePRT.inline.hpp index 6fde2e3b5ef..350bdf17ce6 100644 --- a/src/hotspot/share/gc/g1/sparsePRT.inline.hpp +++ b/src/hotspot/share/gc/g1/sparsePRT.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_G1_SPARSEPRT_INLINE_HPP #define SHARE_GC_G1_SPARSEPRT_INLINE_HPP -#include "gc/g1/g1CollectedHeap.hpp" #include "gc/g1/sparsePRT.hpp" +#include "gc/g1/g1CollectedHeap.hpp" + inline bool SparsePRT::contains_card(RegionIdx_t region_id, CardIdx_t card_index) const { return _table->contains_card(region_id, card_index); } diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp b/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp index a51938712fc..6b939abd594 100644 --- a/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp +++ b/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP #include "gc/parallel/parMarkBitMap.hpp" + #include "utilities/align.hpp" #include "utilities/bitMap.inline.hpp" diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp index dbc91640564..a867c689c98 100644 --- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp +++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP #include "gc/parallel/parallelScavengeHeap.hpp" + #include "gc/parallel/psParallelCompact.inline.hpp" #include "gc/parallel/psScavenge.hpp" diff --git a/src/hotspot/share/gc/parallel/psClosure.inline.hpp b/src/hotspot/share/gc/parallel/psClosure.inline.hpp index 8e347b20f78..fbd542ce9f3 100644 --- a/src/hotspot/share/gc/parallel/psClosure.inline.hpp +++ b/src/hotspot/share/gc/parallel/psClosure.inline.hpp @@ -25,6 +25,8 @@ #ifndef SHARE_GC_PARALLEL_PSCLOSURE_INLINE_HPP #define SHARE_GC_PARALLEL_PSCLOSURE_INLINE_HPP +// No psClosure.hpp + #include "gc/parallel/psPromotionManager.inline.hpp" #include "gc/parallel/psScavenge.inline.hpp" #include "memory/iterator.hpp" diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp index 02605f4fc52..e40e3689da2 100644 --- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp +++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp @@ -25,10 +25,11 @@ #ifndef SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP #define SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP +#include "gc/parallel/psCompactionManager.hpp" + #include "classfile/classLoaderData.hpp" #include "classfile/javaClasses.inline.hpp" #include "gc/parallel/parMarkBitMap.hpp" -#include "gc/parallel/psCompactionManager.hpp" #include "gc/parallel/psParallelCompact.inline.hpp" #include "gc/shared/taskqueue.inline.hpp" #include "oops/access.inline.hpp" diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp index 3bc193dd061..f353b44d627 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP #define SHARE_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP +#include "gc/parallel/psParallelCompact.hpp" + #include "gc/parallel/parallelScavengeHeap.hpp" #include "gc/parallel/parMarkBitMap.inline.hpp" -#include "gc/parallel/psParallelCompact.hpp" #include "gc/shared/collectedHeap.hpp" #include "oops/access.inline.hpp" #include "oops/compressedOops.inline.hpp" diff --git a/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp index 4739daed5ab..b6156a21130 100644 --- a/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp +++ b/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP #include "gc/parallel/psPromotionLAB.hpp" + #include "gc/shared/collectedHeap.inline.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp index fd5438badb0..748ca840f43 100644 --- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp +++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp @@ -25,11 +25,12 @@ #ifndef SHARE_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP #define SHARE_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP +#include "gc/parallel/psPromotionManager.hpp" + #include "gc/parallel/parallelScavengeHeap.hpp" #include "gc/parallel/parMarkBitMap.inline.hpp" #include "gc/parallel/psOldGen.hpp" #include "gc/parallel/psPromotionLAB.inline.hpp" -#include "gc/parallel/psPromotionManager.hpp" #include "gc/parallel/psScavenge.inline.hpp" #include "gc/shared/taskqueue.inline.hpp" #include "gc/shared/tlab_globals.hpp" diff --git a/src/hotspot/share/gc/parallel/psScavenge.inline.hpp b/src/hotspot/share/gc/parallel/psScavenge.inline.hpp index fcc9c06a721..1fee9f08339 100644 --- a/src/hotspot/share/gc/parallel/psScavenge.inline.hpp +++ b/src/hotspot/share/gc/parallel/psScavenge.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_GC_PARALLEL_PSSCAVENGE_INLINE_HPP #define SHARE_GC_PARALLEL_PSSCAVENGE_INLINE_HPP -#include "gc/parallel/parallelScavengeHeap.hpp" #include "gc/parallel/psScavenge.hpp" + +#include "gc/parallel/parallelScavengeHeap.hpp" #include "logging/log.hpp" #include "memory/iterator.hpp" #include "memory/resourceArea.hpp" diff --git a/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp b/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp index f3a3079f068..9b6b5c3c2bb 100644 --- a/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp +++ b/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP #include "gc/serial/defNewGeneration.hpp" + #include "gc/shared/cardTableRS.hpp" #include "gc/shared/genCollectedHeap.hpp" #include "gc/shared/genOopClosures.inline.hpp" diff --git a/src/hotspot/share/gc/serial/markSweep.inline.hpp b/src/hotspot/share/gc/serial/markSweep.inline.hpp index 5a2c6a607c4..1e06cf60ad4 100644 --- a/src/hotspot/share/gc/serial/markSweep.inline.hpp +++ b/src/hotspot/share/gc/serial/markSweep.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_GC_SERIAL_MARKSWEEP_INLINE_HPP #define SHARE_GC_SERIAL_MARKSWEEP_INLINE_HPP -#include "classfile/classLoaderData.inline.hpp" #include "gc/serial/markSweep.hpp" + +#include "classfile/classLoaderData.inline.hpp" #include "memory/universe.hpp" #include "oops/markWord.inline.hpp" #include "oops/access.inline.hpp" diff --git a/src/hotspot/share/gc/serial/serialHeap.inline.hpp b/src/hotspot/share/gc/serial/serialHeap.inline.hpp index 68dd7236633..6e06c7b6d57 100644 --- a/src/hotspot/share/gc/serial/serialHeap.inline.hpp +++ b/src/hotspot/share/gc/serial/serialHeap.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_GC_SERIAL_SERIALHEAP_INLINE_HPP #define SHARE_GC_SERIAL_SERIALHEAP_INLINE_HPP -#include "gc/serial/defNewGeneration.inline.hpp" #include "gc/serial/serialHeap.hpp" + +#include "gc/serial/defNewGeneration.inline.hpp" #include "gc/serial/tenuredGeneration.inline.hpp" template diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp index 02ebd79c703..f79d31786e2 100644 --- a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp +++ b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SERIAL_TENUREDGENERATION_INLINE_HPP #include "gc/serial/tenuredGeneration.hpp" + #include "gc/shared/space.inline.hpp" HeapWord* TenuredGeneration::allocate(size_t word_size, diff --git a/src/hotspot/share/gc/shared/ageTable.inline.hpp b/src/hotspot/share/gc/shared/ageTable.inline.hpp index c5a031595aa..d819a730501 100644 --- a/src/hotspot/share/gc/shared/ageTable.inline.hpp +++ b/src/hotspot/share/gc/shared/ageTable.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHARED_AGETABLE_INLINE_HPP #include "gc/shared/ageTable.hpp" + #include "oops/oop.inline.hpp" // add entry diff --git a/src/hotspot/share/gc/shared/barrierSet.inline.hpp b/src/hotspot/share/gc/shared/barrierSet.inline.hpp index 924f3529fb4..032912d60b2 100644 --- a/src/hotspot/share/gc/shared/barrierSet.inline.hpp +++ b/src/hotspot/share/gc/shared/barrierSet.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_SHARED_BARRIERSET_INLINE_HPP #include "gc/shared/barrierSet.hpp" + #include "oops/accessDecorators.hpp" #include "oops/arrayOop.hpp" #include "oops/compressedOops.inline.hpp" diff --git a/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp b/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp index 6766c4b9e44..ceb852b4ffc 100644 --- a/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp +++ b/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP #include "gc/shared/blockOffsetTable.hpp" + #include "gc/shared/space.hpp" #include "runtime/safepoint.hpp" diff --git a/src/hotspot/share/gc/shared/cardGeneration.inline.hpp b/src/hotspot/share/gc/shared/cardGeneration.inline.hpp index d1885e7b0ed..bd8285af679 100644 --- a/src/hotspot/share/gc/shared/cardGeneration.inline.hpp +++ b/src/hotspot/share/gc/shared/cardGeneration.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHARED_CARDGENERATION_INLINE_HPP #include "gc/shared/cardGeneration.hpp" + #include "gc/shared/space.hpp" inline size_t CardGeneration::capacity() const { diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp index 97e3c4593df..aa12f97452b 100644 --- a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp +++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP #include "gc/shared/cardTableBarrierSet.hpp" + #include "gc/shared/cardTable.hpp" #include "runtime/atomic.hpp" diff --git a/src/hotspot/share/gc/shared/collectedHeap.inline.hpp b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp index 94b3b50238f..89aa64f132d 100644 --- a/src/hotspot/share/gc/shared/collectedHeap.inline.hpp +++ b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHARED_COLLECTEDHEAP_INLINE_HPP #include "gc/shared/collectedHeap.hpp" + #include "gc/shared/memAllocator.hpp" #include "oops/oop.inline.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/share/gc/shared/gcLocker.inline.hpp b/src/hotspot/share/gc/shared/gcLocker.inline.hpp index 7f915242251..39585bfe19e 100644 --- a/src/hotspot/share/gc/shared/gcLocker.inline.hpp +++ b/src/hotspot/share/gc/shared/gcLocker.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHARED_GCLOCKER_INLINE_HPP #include "gc/shared/gcLocker.hpp" + #include "runtime/thread.inline.hpp" void GCLocker::lock_critical(JavaThread* thread) { diff --git a/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp b/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp index 2d64844adb9..aa904b08f8e 100644 --- a/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp +++ b/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_GC_SHARED_GCTRACETIME_INLINE_HPP #define SHARE_GC_SHARED_GCTRACETIME_INLINE_HPP -#include "gc/shared/gcTimer.hpp" #include "gc/shared/gcTraceTime.hpp" + +#include "gc/shared/gcTimer.hpp" #include "logging/log.hpp" #include "runtime/os.hpp" #include "utilities/ticks.hpp" diff --git a/src/hotspot/share/gc/shared/gcUtil.inline.hpp b/src/hotspot/share/gc/shared/gcUtil.inline.hpp index 99a799426a2..5c0a8547e32 100644 --- a/src/hotspot/share/gc/shared/gcUtil.inline.hpp +++ b/src/hotspot/share/gc/shared/gcUtil.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHARED_GCUTIL_INLINE_HPP #include "gc/shared/gcUtil.hpp" + #include "memory/allocation.inline.hpp" inline void* AdaptivePaddedAverage::operator new(size_t size) throw() { diff --git a/src/hotspot/share/gc/shared/genOopClosures.inline.hpp b/src/hotspot/share/gc/shared/genOopClosures.inline.hpp index 0b547e6dcff..c81497318e1 100644 --- a/src/hotspot/share/gc/shared/genOopClosures.inline.hpp +++ b/src/hotspot/share/gc/shared/genOopClosures.inline.hpp @@ -25,10 +25,11 @@ #ifndef SHARE_GC_SHARED_GENOOPCLOSURES_INLINE_HPP #define SHARE_GC_SHARED_GENOOPCLOSURES_INLINE_HPP +#include "gc/shared/genOopClosures.hpp" + #include "classfile/classLoaderData.hpp" #include "gc/shared/cardTableRS.hpp" #include "gc/shared/genCollectedHeap.hpp" -#include "gc/shared/genOopClosures.hpp" #include "gc/shared/generation.hpp" #include "gc/shared/space.hpp" #include "oops/access.inline.hpp" diff --git a/src/hotspot/share/gc/shared/locationPrinter.inline.hpp b/src/hotspot/share/gc/shared/locationPrinter.inline.hpp index 9d78af9ab0f..f57a030deb7 100644 --- a/src/hotspot/share/gc/shared/locationPrinter.inline.hpp +++ b/src/hotspot/share/gc/shared/locationPrinter.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHARED_LOCATIONPRINTER_INLINE_HPP #include "gc/shared/locationPrinter.hpp" + #include "oops/compressedOops.inline.hpp" #include "oops/oopsHierarchy.hpp" diff --git a/src/hotspot/share/gc/shared/markBitMap.inline.hpp b/src/hotspot/share/gc/shared/markBitMap.inline.hpp index 020f8e5bd9b..cdcf063949f 100644 --- a/src/hotspot/share/gc/shared/markBitMap.inline.hpp +++ b/src/hotspot/share/gc/shared/markBitMap.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_GC_SHARED_MARKBITMAP_INLINE_HPP #define SHARE_GC_SHARED_MARKBITMAP_INLINE_HPP -#include "gc/shared/collectedHeap.hpp" #include "gc/shared/markBitMap.hpp" + +#include "gc/shared/collectedHeap.hpp" #include "memory/memRegion.hpp" #include "utilities/align.hpp" #include "utilities/bitMap.inline.hpp" diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp index 94594b923bc..411817c3b04 100644 --- a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp +++ b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_GC_SHARED_MODREFBARRIERSET_INLINE_HPP #define SHARE_GC_SHARED_MODREFBARRIERSET_INLINE_HPP -#include "gc/shared/barrierSet.hpp" #include "gc/shared/modRefBarrierSet.hpp" + +#include "gc/shared/barrierSet.hpp" #include "oops/compressedOops.inline.hpp" #include "oops/objArrayOop.hpp" #include "oops/oop.hpp" diff --git a/src/hotspot/share/gc/shared/oopStorage.inline.hpp b/src/hotspot/share/gc/shared/oopStorage.inline.hpp index 3513f3ecd6d..4bcff174b5f 100644 --- a/src/hotspot/share/gc/shared/oopStorage.inline.hpp +++ b/src/hotspot/share/gc/shared/oopStorage.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHARED_OOPSTORAGE_INLINE_HPP #include "gc/shared/oopStorage.hpp" + #include "memory/allocation.hpp" #include "metaprogramming/conditional.hpp" #include "metaprogramming/isConst.hpp" diff --git a/src/hotspot/share/gc/shared/oopStorageParState.inline.hpp b/src/hotspot/share/gc/shared/oopStorageParState.inline.hpp index d3d1c306846..ce37d4ede93 100644 --- a/src/hotspot/share/gc/shared/oopStorageParState.inline.hpp +++ b/src/hotspot/share/gc/shared/oopStorageParState.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_GC_SHARED_OOPSTORAGEPARSTATE_INLINE_HPP #define SHARE_GC_SHARED_OOPSTORAGEPARSTATE_INLINE_HPP -#include "gc/shared/oopStorage.inline.hpp" #include "gc/shared/oopStorageParState.hpp" + +#include "gc/shared/oopStorage.inline.hpp" #include "metaprogramming/conditional.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/gc/shared/oopStorageSet.inline.hpp b/src/hotspot/share/gc/shared/oopStorageSet.inline.hpp index a4ca67b9103..14e75979fbd 100644 --- a/src/hotspot/share/gc/shared/oopStorageSet.inline.hpp +++ b/src/hotspot/share/gc/shared/oopStorageSet.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_GC_SHARED_OOPSTORAGESET_INLINE_HPP #define SHARE_GC_SHARED_OOPSTORAGESET_INLINE_HPP -#include "gc/shared/oopStorage.inline.hpp" #include "gc/shared/oopStorageSet.hpp" + +#include "gc/shared/oopStorage.inline.hpp" #include "utilities/enumIterator.hpp" template diff --git a/src/hotspot/share/gc/shared/oopStorageSetParState.inline.hpp b/src/hotspot/share/gc/shared/oopStorageSetParState.inline.hpp index b5cf105e070..b1ae49e7ad1 100644 --- a/src/hotspot/share/gc/shared/oopStorageSetParState.inline.hpp +++ b/src/hotspot/share/gc/shared/oopStorageSetParState.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_SHARED_OOPSTORAGESETPARSTATE_INLINE_HPP #define SHARE_GC_SHARED_OOPSTORAGESETPARSTATE_INLINE_HPP +#include "gc/shared/oopStorageSetParState.hpp" + #include "gc/shared/oopStorageParState.inline.hpp" #include "gc/shared/oopStorageSet.hpp" -#include "gc/shared/oopStorageSetParState.hpp" #include "memory/iterator.hpp" #include "runtime/atomic.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp b/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp index de6ded3f19f..d3f8bdfeac7 100644 --- a/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp +++ b/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHARED_PARTIALARRAYTASKSTEPPER_INLINE_HPP #include "gc/shared/partialArrayTaskStepper.hpp" + #include "oops/arrayOop.hpp" #include "runtime/atomic.hpp" diff --git a/src/hotspot/share/gc/shared/plab.inline.hpp b/src/hotspot/share/gc/shared/plab.inline.hpp index b0698da8a33..27eab27453e 100644 --- a/src/hotspot/share/gc/shared/plab.inline.hpp +++ b/src/hotspot/share/gc/shared/plab.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_GC_SHARED_PLAB_INLINE_HPP #define SHARE_GC_SHARED_PLAB_INLINE_HPP -#include "gc/shared/collectedHeap.inline.hpp" #include "gc/shared/plab.hpp" + +#include "gc/shared/collectedHeap.inline.hpp" #include "memory/allocation.inline.hpp" #include "runtime/atomic.hpp" diff --git a/src/hotspot/share/gc/shared/preservedMarks.inline.hpp b/src/hotspot/share/gc/shared/preservedMarks.inline.hpp index 82df737a7b8..44bb26f87e6 100644 --- a/src/hotspot/share/gc/shared/preservedMarks.inline.hpp +++ b/src/hotspot/share/gc/shared/preservedMarks.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHARED_PRESERVEDMARKS_INLINE_HPP #include "gc/shared/preservedMarks.hpp" + #include "logging/log.hpp" #include "oops/oop.inline.hpp" #include "utilities/stack.inline.hpp" diff --git a/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp b/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp index 8196ce8db02..c1b62f99995 100644 --- a/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp +++ b/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP #include "gc/shared/referenceProcessor.hpp" + #include "oops/compressedOops.inline.hpp" #include "oops/oop.hpp" diff --git a/src/hotspot/share/gc/shared/space.inline.hpp b/src/hotspot/share/gc/shared/space.inline.hpp index e5ea0db5e46..ce2423ece3f 100644 --- a/src/hotspot/share/gc/shared/space.inline.hpp +++ b/src/hotspot/share/gc/shared/space.inline.hpp @@ -25,10 +25,11 @@ #ifndef SHARE_GC_SHARED_SPACE_INLINE_HPP #define SHARE_GC_SHARED_SPACE_INLINE_HPP +#include "gc/shared/space.hpp" + #include "gc/shared/blockOffsetTable.inline.hpp" #include "gc/shared/collectedHeap.hpp" #include "gc/shared/generation.hpp" -#include "gc/shared/space.hpp" #include "gc/shared/spaceDecorator.hpp" #include "oops/oopsHierarchy.hpp" #include "oops/oop.inline.hpp" diff --git a/src/hotspot/share/gc/shared/spaceDecorator.inline.hpp b/src/hotspot/share/gc/shared/spaceDecorator.inline.hpp index c902efa0127..e668353d40f 100644 --- a/src/hotspot/share/gc/shared/spaceDecorator.inline.hpp +++ b/src/hotspot/share/gc/shared/spaceDecorator.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_SHARED_SPACEDECORATOR_INLINE_HPP #define SHARE_GC_SHARED_SPACEDECORATOR_INLINE_HPP +#include "gc/shared/spaceDecorator.hpp" + #include "gc/parallel/mutableSpace.hpp" #include "gc/shared/space.hpp" -#include "gc/shared/spaceDecorator.hpp" #include "utilities/globalDefinitions.hpp" inline HeapWord* GenSpaceMangler::top() const { return _sp->top(); } diff --git a/src/hotspot/share/gc/shared/taskqueue.inline.hpp b/src/hotspot/share/gc/shared/taskqueue.inline.hpp index 46372956cf0..265666551cf 100644 --- a/src/hotspot/share/gc/shared/taskqueue.inline.hpp +++ b/src/hotspot/share/gc/shared/taskqueue.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHARED_TASKQUEUE_INLINE_HPP #include "gc/shared/taskqueue.hpp" + #include "memory/allocation.inline.hpp" #include "oops/oop.inline.hpp" #include "runtime/atomic.hpp" diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp index ce88cc3e906..3b167d752e7 100644 --- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp +++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP #define SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP +#include "gc/shared/threadLocalAllocBuffer.hpp" + #include "gc/shared/collectedHeap.hpp" #include "gc/shared/tlab_globals.hpp" -#include "gc/shared/threadLocalAllocBuffer.hpp" #include "memory/universe.hpp" #include "logging/log.hpp" #include "runtime/osThread.hpp" diff --git a/src/hotspot/share/gc/shared/weakProcessor.inline.hpp b/src/hotspot/share/gc/shared/weakProcessor.inline.hpp index 18b0f6f0024..f1b8e6f92b0 100644 --- a/src/hotspot/share/gc/shared/weakProcessor.inline.hpp +++ b/src/hotspot/share/gc/shared/weakProcessor.inline.hpp @@ -25,11 +25,12 @@ #ifndef SHARE_GC_SHARED_WEAKPROCESSOR_INLINE_HPP #define SHARE_GC_SHARED_WEAKPROCESSOR_INLINE_HPP +#include "gc/shared/weakProcessor.hpp" + #include "classfile/stringTable.hpp" #include "gc/shared/oopStorage.inline.hpp" #include "gc/shared/oopStorageParState.inline.hpp" #include "gc/shared/oopStorageSet.hpp" -#include "gc/shared/weakProcessor.hpp" #include "gc/shared/weakProcessorTimes.hpp" #include "gc/shared/workgroup.hpp" #include "prims/resolvedMethodTable.hpp" diff --git a/src/hotspot/share/gc/shared/workerDataArray.inline.hpp b/src/hotspot/share/gc/shared/workerDataArray.inline.hpp index e1b4732afc1..216b6dafb00 100644 --- a/src/hotspot/share/gc/shared/workerDataArray.inline.hpp +++ b/src/hotspot/share/gc/shared/workerDataArray.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHARED_WORKERDATAARRAY_INLINE_HPP #include "gc/shared/workerDataArray.hpp" + #include "memory/allocation.inline.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp index b15542ac3fb..d0beb4c22cf 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP +#include "gc/shenandoah/shenandoahBarrierSet.hpp" + #include "gc/shared/accessBarrierSupport.inline.hpp" #include "gc/shenandoah/shenandoahAsserts.hpp" -#include "gc/shenandoah/shenandoahBarrierSet.hpp" #include "gc/shenandoah/shenandoahCollectionSet.inline.hpp" #include "gc/shenandoah/shenandoahEvacOOMHandler.inline.hpp" #include "gc/shenandoah/shenandoahForwarding.inline.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetClone.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetClone.inline.hpp index ca10336feb1..69785a61060 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetClone.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetClone.inline.hpp @@ -25,6 +25,8 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSETCLONE_INLINE_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSETCLONE_INLINE_HPP +// No shenandoahBarrierSetClone.hpp + #include "gc/shenandoah/shenandoahBarrierSet.inline.hpp" #include "gc/shenandoah/shenandoahCollectionSet.inline.hpp" #include "gc/shenandoah/shenandoahEvacOOMHandler.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp b/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp index 52d04a33b8a..e170376f8d2 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp @@ -28,6 +28,7 @@ #include "oops/accessDecorators.hpp" #include "runtime/handshake.hpp" +class BarrierSetNMethod; class ShenandoahBarrierSet; class ShenandoahHeap; class ShenandoahMarkingContext; diff --git a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp index e6e219f7400..44a16da8ee7 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp @@ -24,10 +24,11 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCLOSURES_INLINE_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHCLOSURES_INLINE_HPP +#include "gc/shenandoah/shenandoahClosures.hpp" + #include "gc/shared/barrierSetNMethod.hpp" #include "gc/shenandoah/shenandoahAsserts.hpp" #include "gc/shenandoah/shenandoahBarrierSet.hpp" -#include "gc/shenandoah/shenandoahClosures.hpp" #include "gc/shenandoah/shenandoahEvacOOMHandler.inline.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahNMethod.inline.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp index a327524a72d..ba73e5e6382 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP #include "gc/shenandoah/shenandoahCollectionSet.hpp" + #include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahHeapRegion.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.inline.hpp index f5cd459cf76..9d2641f1ddb 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_INLINE_HPP #include "gc/shenandoah/shenandoahEvacOOMHandler.hpp" + #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahThreadLocalData.hpp" #include "runtime/atomic.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp index 7020d7a4b99..3bcd079e850 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHFORWARDING_INLINE_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHFORWARDING_INLINE_HPP -#include "gc/shenandoah/shenandoahAsserts.hpp" #include "gc/shenandoah/shenandoahForwarding.hpp" + +#include "gc/shenandoah/shenandoahAsserts.hpp" #include "oops/markWord.inline.hpp" #include "runtime/thread.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp index 4e83b9fc971..f300233d7e2 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp @@ -25,6 +25,8 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP +#include "gc/shenandoah/shenandoahHeap.hpp" + #include "classfile/javaClasses.inline.hpp" #include "gc/shared/markBitMap.inline.hpp" #include "gc/shared/threadLocalAllocBuffer.inline.hpp" @@ -35,7 +37,6 @@ #include "gc/shenandoah/shenandoahCollectionSet.inline.hpp" #include "gc/shenandoah/shenandoahForwarding.inline.hpp" #include "gc/shenandoah/shenandoahWorkGroup.hpp" -#include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp" #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp" #include "gc/shenandoah/shenandoahControlThread.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp index 461aa30fcbe..4719e29b581 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP -#include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahHeapRegion.hpp" + +#include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahPacer.inline.hpp" #include "runtime/atomic.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp index 84f58d30189..63d84c98a56 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP #include "gc/shenandoah/shenandoahHeapRegionSet.hpp" + #include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahHeapRegion.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp index 6561a48f34e..7c9ee7d2222 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp @@ -25,10 +25,11 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMARK_INLINE_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHMARK_INLINE_HPP +#include "gc/shenandoah/shenandoahMark.hpp" + #include "gc/shenandoah/shenandoahAsserts.hpp" #include "gc/shenandoah/shenandoahBarrierSet.inline.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" -#include "gc/shenandoah/shenandoahMark.hpp" #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp" #include "gc/shenandoah/shenandoahStringDedup.inline.hpp" #include "gc/shenandoah/shenandoahTaskqueue.inline.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp index 9dd3f729899..a448f199404 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp @@ -27,6 +27,7 @@ #define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKBITMAP_INLINE_HPP #include "gc/shenandoah/shenandoahMarkBitMap.hpp" + #include "runtime/atomic.hpp" #include "utilities/count_trailing_zeros.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp index f829d2aa232..34b8288f476 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP -#include "gc/shenandoah/shenandoahMarkBitMap.inline.hpp" #include "gc/shenandoah/shenandoahMarkingContext.hpp" +#include "gc/shenandoah/shenandoahMarkBitMap.inline.hpp" + inline bool ShenandoahMarkingContext::mark_strong(oop obj, bool& was_upgraded) { return !allocated_after_mark_start(obj) && _mark_bit_map.mark_strong(cast_from_oop(obj), was_upgraded); } diff --git a/src/hotspot/share/gc/shenandoah/shenandoahNMethod.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahNMethod.inline.hpp index 31a19a9ed5e..2a6f9fea8cd 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahNMethod.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahNMethod.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHNMETHOD_INLINE_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHNMETHOD_INLINE_HPP +#include "gc/shenandoah/shenandoahNMethod.hpp" + #include "gc/shared/barrierSet.hpp" #include "gc/shared/barrierSetNMethod.hpp" -#include "gc/shenandoah/shenandoahNMethod.hpp" #include "gc/shenandoah/shenandoahClosures.inline.hpp" nmethod* ShenandoahNMethod::nm() const { diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp index c0b35f18e02..47bd5cac5c1 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp @@ -25,6 +25,8 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP +#include "gc/shenandoah/shenandoahOopClosures.hpp" + #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahMark.inline.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp index 783755a4320..38ce12437a3 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP #include "gc/shenandoah/shenandoahPacer.hpp" + #include "runtime/atomic.hpp" inline void ShenandoahPacer::report_mark(size_t words) { diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPadding.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPadding.hpp index b6038d980c3..cd8f32bf18b 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahPadding.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahPadding.hpp @@ -22,8 +22,8 @@ * */ -#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPADDING_INLINE_HPP -#define SHARE_GC_SHENANDOAH_SHENANDOAHPADDING_INLINE_HPP +#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPADDING_HPP +#define SHARE_GC_SHENANDOAH_SHENANDOAHPADDING_HPP // 64 bytes is enough to cover all existing architectures. If we have some // other platforms, we would need to provide the architecture-specific @@ -35,4 +35,4 @@ #define shenandoah_padding(id) \ DEFINE_PAD_MINUS_SIZE(id, SHENANDOAH_CACHE_LINE_SIZE, 0) -#endif // SHARE_GC_SHENANDOAH_SHENANDOAHPADDING_INLINE_HPP +#endif // SHARE_GC_SHENANDOAH_SHENANDOAHPADDING_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahParallelCleaning.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahParallelCleaning.inline.hpp index c8a2d0147e4..f88e9bb394c 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahParallelCleaning.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahParallelCleaning.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPARALLELCLEANING_INLINE_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHPARALLELCLEANING_INLINE_HPP +#include "gc/shenandoah/shenandoahParallelCleaning.hpp" + #include "gc/shared/weakProcessor.inline.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" -#include "gc/shenandoah/shenandoahParallelCleaning.hpp" #include "gc/shenandoah/shenandoahUtils.hpp" #include "runtime/thread.hpp" #include "runtime/safepoint.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp index 10023282d5e..3f614d1e208 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp @@ -25,12 +25,13 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_INLINE_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_INLINE_HPP +#include "gc/shenandoah/shenandoahRootProcessor.hpp" + #include "classfile/classLoaderDataGraph.hpp" #include "gc/shared/oopStorageSetParState.inline.hpp" #include "gc/shenandoah/shenandoahClosures.inline.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahPhaseTimings.hpp" -#include "gc/shenandoah/shenandoahRootProcessor.hpp" #include "gc/shenandoah/shenandoahUtils.hpp" #include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp" #include "memory/resourceArea.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.inline.hpp index 18754a212c0..e2d97798969 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_INLINE_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_INLINE_HPP -#include "classfile/javaClasses.inline.hpp" #include "gc/shenandoah/shenandoahStringDedup.hpp" +#include "classfile/javaClasses.inline.hpp" + bool ShenandoahStringDedup::is_string_candidate(oop obj) { assert(Thread::current()->is_Worker_thread(), "Only from a GC worker thread"); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp index 447e71a6b8e..fa770021742 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP -#include "gc/shared/taskqueue.inline.hpp" #include "gc/shenandoah/shenandoahTaskqueue.hpp" + +#include "gc/shared/taskqueue.inline.hpp" #include "utilities/stack.inline.hpp" template diff --git a/src/hotspot/share/gc/z/zAbort.inline.hpp b/src/hotspot/share/gc/z/zAbort.inline.hpp index b0106cc7b3f..a8af1b7f720 100644 --- a/src/hotspot/share/gc/z/zAbort.inline.hpp +++ b/src/hotspot/share/gc/z/zAbort.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZABORT_INLINE_HPP #include "gc/z/zAbort.hpp" + #include "runtime/atomic.hpp" inline bool ZAbort::should_abort() { diff --git a/src/hotspot/share/gc/z/zAddress.inline.hpp b/src/hotspot/share/gc/z/zAddress.inline.hpp index a752c91088b..a151e7182e4 100644 --- a/src/hotspot/share/gc/z/zAddress.inline.hpp +++ b/src/hotspot/share/gc/z/zAddress.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZADDRESS_INLINE_HPP #include "gc/z/zAddress.hpp" + #include "gc/z/zGlobals.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/gc/z/zArray.inline.hpp b/src/hotspot/share/gc/z/zArray.inline.hpp index 03ea1d18754..b7e5bba9adb 100644 --- a/src/hotspot/share/gc/z/zArray.inline.hpp +++ b/src/hotspot/share/gc/z/zArray.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZARRAY_INLINE_HPP #include "gc/z/zArray.hpp" + #include "runtime/atomic.hpp" template diff --git a/src/hotspot/share/gc/z/zAttachedArray.inline.hpp b/src/hotspot/share/gc/z/zAttachedArray.inline.hpp index f52f83186e4..8ad233ed5da 100644 --- a/src/hotspot/share/gc/z/zAttachedArray.inline.hpp +++ b/src/hotspot/share/gc/z/zAttachedArray.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZATTACHEDARRAY_INLINE_HPP #include "gc/z/zAttachedArray.hpp" + #include "memory/allocation.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/share/gc/z/zBarrier.inline.hpp b/src/hotspot/share/gc/z/zBarrier.inline.hpp index 48ff0d6e29c..0fa6110051e 100644 --- a/src/hotspot/share/gc/z/zBarrier.inline.hpp +++ b/src/hotspot/share/gc/z/zBarrier.inline.hpp @@ -24,8 +24,9 @@ #ifndef SHARE_GC_Z_ZBARRIER_INLINE_HPP #define SHARE_GC_Z_ZBARRIER_INLINE_HPP -#include "gc/z/zAddress.inline.hpp" #include "gc/z/zBarrier.hpp" + +#include "gc/z/zAddress.inline.hpp" #include "gc/z/zOop.inline.hpp" #include "gc/z/zResurrection.inline.hpp" #include "oops/oop.hpp" diff --git a/src/hotspot/share/gc/z/zBarrierSet.inline.hpp b/src/hotspot/share/gc/z/zBarrierSet.inline.hpp index 4fb5b1e38f4..0970b519e10 100644 --- a/src/hotspot/share/gc/z/zBarrierSet.inline.hpp +++ b/src/hotspot/share/gc/z/zBarrierSet.inline.hpp @@ -24,9 +24,10 @@ #ifndef SHARE_GC_Z_ZBARRIERSET_INLINE_HPP #define SHARE_GC_Z_ZBARRIERSET_INLINE_HPP +#include "gc/z/zBarrierSet.hpp" + #include "gc/shared/accessBarrierSupport.inline.hpp" #include "gc/z/zBarrier.inline.hpp" -#include "gc/z/zBarrierSet.hpp" #include "utilities/debug.hpp" template diff --git a/src/hotspot/share/gc/z/zBitMap.inline.hpp b/src/hotspot/share/gc/z/zBitMap.inline.hpp index df40579090f..f757cec2706 100644 --- a/src/hotspot/share/gc/z/zBitMap.inline.hpp +++ b/src/hotspot/share/gc/z/zBitMap.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZBITMAP_INLINE_HPP #include "gc/z/zBitMap.hpp" + #include "runtime/atomic.hpp" #include "utilities/bitMap.inline.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/gc/z/zCPU.inline.hpp b/src/hotspot/share/gc/z/zCPU.inline.hpp index 7de98ae6285..45c7e36568e 100644 --- a/src/hotspot/share/gc/z/zCPU.inline.hpp +++ b/src/hotspot/share/gc/z/zCPU.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZCPU_INLINE_HPP #include "gc/z/zCPU.hpp" + #include "runtime/os.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/gc/z/zForwarding.inline.hpp b/src/hotspot/share/gc/z/zForwarding.inline.hpp index 393684f92d6..31bf7292996 100644 --- a/src/hotspot/share/gc/z/zForwarding.inline.hpp +++ b/src/hotspot/share/gc/z/zForwarding.inline.hpp @@ -24,8 +24,9 @@ #ifndef SHARE_GC_Z_ZFORWARDING_INLINE_HPP #define SHARE_GC_Z_ZFORWARDING_INLINE_HPP -#include "gc/z/zAttachedArray.inline.hpp" #include "gc/z/zForwarding.hpp" + +#include "gc/z/zAttachedArray.inline.hpp" #include "gc/z/zForwardingAllocator.inline.hpp" #include "gc/z/zHash.inline.hpp" #include "gc/z/zHeap.hpp" diff --git a/src/hotspot/share/gc/z/zForwardingAllocator.inline.hpp b/src/hotspot/share/gc/z/zForwardingAllocator.inline.hpp index eea8110b1a5..7c2e2155b16 100644 --- a/src/hotspot/share/gc/z/zForwardingAllocator.inline.hpp +++ b/src/hotspot/share/gc/z/zForwardingAllocator.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZFORWARDINGALLOCATOR_INLINE_HPP #include "gc/z/zForwardingAllocator.hpp" + #include "runtime/atomic.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/gc/z/zForwardingTable.inline.hpp b/src/hotspot/share/gc/z/zForwardingTable.inline.hpp index be2fbe3ee3b..96432474094 100644 --- a/src/hotspot/share/gc/z/zForwardingTable.inline.hpp +++ b/src/hotspot/share/gc/z/zForwardingTable.inline.hpp @@ -24,9 +24,10 @@ #ifndef SHARE_GC_Z_ZFORWARDINGTABLE_INLINE_HPP #define SHARE_GC_Z_ZFORWARDINGTABLE_INLINE_HPP +#include "gc/z/zForwardingTable.hpp" + #include "gc/z/zAddress.inline.hpp" #include "gc/z/zForwarding.inline.hpp" -#include "gc/z/zForwardingTable.hpp" #include "gc/z/zGlobals.hpp" #include "gc/z/zGranuleMap.inline.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/gc/z/zFuture.inline.hpp b/src/hotspot/share/gc/z/zFuture.inline.hpp index 1919438d06d..a6c973410eb 100644 --- a/src/hotspot/share/gc/z/zFuture.inline.hpp +++ b/src/hotspot/share/gc/z/zFuture.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZFUTURE_INLINE_HPP #include "gc/z/zFuture.hpp" + #include "runtime/semaphore.inline.hpp" #include "runtime/thread.hpp" diff --git a/src/hotspot/share/gc/z/zGranuleMap.inline.hpp b/src/hotspot/share/gc/z/zGranuleMap.inline.hpp index 33712fce37f..457bccfa61c 100644 --- a/src/hotspot/share/gc/z/zGranuleMap.inline.hpp +++ b/src/hotspot/share/gc/z/zGranuleMap.inline.hpp @@ -24,9 +24,10 @@ #ifndef SHARE_GC_Z_ZGRANULEMAP_INLINE_HPP #define SHARE_GC_Z_ZGRANULEMAP_INLINE_HPP +#include "gc/z/zGranuleMap.hpp" + #include "gc/z/zArray.inline.hpp" #include "gc/z/zGlobals.hpp" -#include "gc/z/zGranuleMap.hpp" #include "memory/allocation.inline.hpp" #include "runtime/atomic.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/share/gc/z/zHash.inline.hpp b/src/hotspot/share/gc/z/zHash.inline.hpp index ea181daee19..2fda5189da4 100644 --- a/src/hotspot/share/gc/z/zHash.inline.hpp +++ b/src/hotspot/share/gc/z/zHash.inline.hpp @@ -58,6 +58,8 @@ #include "gc/z/zHash.hpp" +#include "gc/z/zAddress.inline.hpp" + inline uint32_t ZHash::uint32_to_uint32(uint32_t key) { key = ~key + (key << 15); key = key ^ (key >> 12); diff --git a/src/hotspot/share/gc/z/zHeap.inline.hpp b/src/hotspot/share/gc/z/zHeap.inline.hpp index 7289dac2ab8..4d7999f3738 100644 --- a/src/hotspot/share/gc/z/zHeap.inline.hpp +++ b/src/hotspot/share/gc/z/zHeap.inline.hpp @@ -24,10 +24,11 @@ #ifndef SHARE_GC_Z_ZHEAP_INLINE_HPP #define SHARE_GC_Z_ZHEAP_INLINE_HPP +#include "gc/z/zHeap.hpp" + #include "gc/z/zAddress.inline.hpp" #include "gc/z/zForwardingTable.inline.hpp" #include "gc/z/zHash.inline.hpp" -#include "gc/z/zHeap.hpp" #include "gc/z/zMark.inline.hpp" #include "gc/z/zPage.inline.hpp" #include "gc/z/zPageTable.inline.hpp" diff --git a/src/hotspot/share/gc/z/zList.inline.hpp b/src/hotspot/share/gc/z/zList.inline.hpp index 8c22c9fcb0c..f559f3a2d45 100644 --- a/src/hotspot/share/gc/z/zList.inline.hpp +++ b/src/hotspot/share/gc/z/zList.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZLIST_INLINE_HPP #include "gc/z/zList.hpp" + #include "utilities/debug.hpp" template diff --git a/src/hotspot/share/gc/z/zLiveMap.inline.hpp b/src/hotspot/share/gc/z/zLiveMap.inline.hpp index 3a7099275c1..bf0fd808a8b 100644 --- a/src/hotspot/share/gc/z/zLiveMap.inline.hpp +++ b/src/hotspot/share/gc/z/zLiveMap.inline.hpp @@ -24,8 +24,9 @@ #ifndef SHARE_GC_Z_ZLIVEMAP_INLINE_HPP #define SHARE_GC_Z_ZLIVEMAP_INLINE_HPP -#include "gc/z/zBitMap.inline.hpp" #include "gc/z/zLiveMap.hpp" + +#include "gc/z/zBitMap.inline.hpp" #include "gc/z/zMark.hpp" #include "gc/z/zOop.inline.hpp" #include "gc/z/zUtils.inline.hpp" diff --git a/src/hotspot/share/gc/z/zLock.inline.hpp b/src/hotspot/share/gc/z/zLock.inline.hpp index b0600da8338..79176d54f30 100644 --- a/src/hotspot/share/gc/z/zLock.inline.hpp +++ b/src/hotspot/share/gc/z/zLock.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZLOCK_INLINE_HPP #include "gc/z/zLock.hpp" + #include "runtime/atomic.hpp" #include "runtime/os.inline.hpp" #include "runtime/thread.hpp" diff --git a/src/hotspot/share/gc/z/zMark.inline.hpp b/src/hotspot/share/gc/z/zMark.inline.hpp index b896e8be225..662ba17fc65 100644 --- a/src/hotspot/share/gc/z/zMark.inline.hpp +++ b/src/hotspot/share/gc/z/zMark.inline.hpp @@ -24,8 +24,9 @@ #ifndef SHARE_GC_Z_ZMARK_INLINE_HPP #define SHARE_GC_Z_ZMARK_INLINE_HPP -#include "gc/z/zAddress.inline.hpp" #include "gc/z/zMark.hpp" + +#include "gc/z/zAddress.inline.hpp" #include "gc/z/zMarkStack.inline.hpp" #include "gc/z/zPage.inline.hpp" #include "gc/z/zPageTable.inline.hpp" diff --git a/src/hotspot/share/gc/z/zMarkCache.inline.hpp b/src/hotspot/share/gc/z/zMarkCache.inline.hpp index 9d96bdfccf5..ee67d333d59 100644 --- a/src/hotspot/share/gc/z/zMarkCache.inline.hpp +++ b/src/hotspot/share/gc/z/zMarkCache.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZMARKCACHE_INLINE_HPP #include "gc/z/zMarkCache.hpp" + #include "gc/z/zPage.inline.hpp" inline void ZMarkCacheEntry::inc_live(ZPage* page, size_t bytes) { diff --git a/src/hotspot/share/gc/z/zMarkStack.inline.hpp b/src/hotspot/share/gc/z/zMarkStack.inline.hpp index debcdcd6691..5eaff5d7049 100644 --- a/src/hotspot/share/gc/z/zMarkStack.inline.hpp +++ b/src/hotspot/share/gc/z/zMarkStack.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZMARKSTACK_INLINE_HPP #include "gc/z/zMarkStack.hpp" + #include "utilities/debug.hpp" #include "runtime/atomic.hpp" diff --git a/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp b/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp index 8fb7a8dc167..f738b65a1e3 100644 --- a/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp +++ b/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp @@ -24,6 +24,8 @@ #ifndef SHARE_GC_Z_ZMARKTERMINATE_INLINE_HPP #define SHARE_GC_Z_ZMARKTERMINATE_INLINE_HPP +#include "gc/z/zMarkTerminate.hpp" + #include "runtime/atomic.hpp" inline ZMarkTerminate::ZMarkTerminate() : diff --git a/src/hotspot/share/gc/z/zMemory.inline.hpp b/src/hotspot/share/gc/z/zMemory.inline.hpp index 9d5fe209913..895e38375ec 100644 --- a/src/hotspot/share/gc/z/zMemory.inline.hpp +++ b/src/hotspot/share/gc/z/zMemory.inline.hpp @@ -24,8 +24,9 @@ #ifndef SHARE_GC_Z_ZMEMORY_INLINE_HPP #define SHARE_GC_Z_ZMEMORY_INLINE_HPP -#include "gc/z/zList.inline.hpp" #include "gc/z/zMemory.hpp" + +#include "gc/z/zList.inline.hpp" #include "utilities/debug.hpp" inline ZMemory::ZMemory(uintptr_t start, size_t size) : diff --git a/src/hotspot/share/gc/z/zMessagePort.inline.hpp b/src/hotspot/share/gc/z/zMessagePort.inline.hpp index a7a5140a999..69016d90728 100644 --- a/src/hotspot/share/gc/z/zMessagePort.inline.hpp +++ b/src/hotspot/share/gc/z/zMessagePort.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZMESSAGEPORT_INLINE_HPP #include "gc/z/zMessagePort.hpp" + #include "gc/z/zFuture.inline.hpp" #include "gc/z/zList.inline.hpp" #include "runtime/mutexLocker.hpp" diff --git a/src/hotspot/share/gc/z/zPage.inline.hpp b/src/hotspot/share/gc/z/zPage.inline.hpp index 132bdbc3663..e7d6742b91c 100644 --- a/src/hotspot/share/gc/z/zPage.inline.hpp +++ b/src/hotspot/share/gc/z/zPage.inline.hpp @@ -24,11 +24,12 @@ #ifndef SHARE_GC_Z_ZPAGE_INLINE_HPP #define SHARE_GC_Z_ZPAGE_INLINE_HPP +#include "gc/z/zPage.hpp" + #include "gc/z/zAddress.inline.hpp" #include "gc/z/zGlobals.hpp" #include "gc/z/zLiveMap.inline.hpp" #include "gc/z/zNUMA.hpp" -#include "gc/z/zPage.hpp" #include "gc/z/zPhysicalMemory.inline.hpp" #include "gc/z/zVirtualMemory.inline.hpp" #include "runtime/atomic.hpp" diff --git a/src/hotspot/share/gc/z/zPageTable.inline.hpp b/src/hotspot/share/gc/z/zPageTable.inline.hpp index e9eea8caa89..d068958615d 100644 --- a/src/hotspot/share/gc/z/zPageTable.inline.hpp +++ b/src/hotspot/share/gc/z/zPageTable.inline.hpp @@ -24,9 +24,10 @@ #ifndef SHARE_GC_Z_ZPAGETABLE_INLINE_HPP #define SHARE_GC_Z_ZPAGETABLE_INLINE_HPP +#include "gc/z/zPageTable.hpp" + #include "gc/z/zAddress.inline.hpp" #include "gc/z/zGranuleMap.inline.hpp" -#include "gc/z/zPageTable.hpp" inline ZPage* ZPageTable::get(uintptr_t addr) const { assert(!ZAddress::is_null(addr), "Invalid address"); diff --git a/src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp b/src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp index a92953fb43a..b2411379935 100644 --- a/src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp +++ b/src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp @@ -25,6 +25,8 @@ #define SHARE_GC_Z_ZPHYSICALMEMORY_INLINE_HPP #include "gc/z/zPhysicalMemory.hpp" + +#include "gc/z/zAddress.inline.hpp" #include "utilities/debug.hpp" inline ZPhysicalMemorySegment::ZPhysicalMemorySegment() : diff --git a/src/hotspot/share/gc/z/zRelocationSet.inline.hpp b/src/hotspot/share/gc/z/zRelocationSet.inline.hpp index bdd5330f4a0..18bf14d2168 100644 --- a/src/hotspot/share/gc/z/zRelocationSet.inline.hpp +++ b/src/hotspot/share/gc/z/zRelocationSet.inline.hpp @@ -24,9 +24,10 @@ #ifndef SHARE_GC_Z_ZRELOCATIONSET_INLINE_HPP #define SHARE_GC_Z_ZRELOCATIONSET_INLINE_HPP -#include "gc/z/zArray.inline.hpp" #include "gc/z/zRelocationSet.hpp" +#include "gc/z/zArray.inline.hpp" + template inline ZRelocationSetIteratorImpl::ZRelocationSetIteratorImpl(ZRelocationSet* relocation_set) : ZArrayIteratorImpl(relocation_set->_forwardings, relocation_set->_nforwardings) {} diff --git a/src/hotspot/share/gc/z/zRelocationSetSelector.inline.hpp b/src/hotspot/share/gc/z/zRelocationSetSelector.inline.hpp index f439cdddbe0..2f31e108856 100644 --- a/src/hotspot/share/gc/z/zRelocationSetSelector.inline.hpp +++ b/src/hotspot/share/gc/z/zRelocationSetSelector.inline.hpp @@ -24,9 +24,10 @@ #ifndef SHARE_GC_Z_ZRELOCATIONSETSELECTOR_INLINE_HPP #define SHARE_GC_Z_ZRELOCATIONSETSELECTOR_INLINE_HPP +#include "gc/z/zRelocationSetSelector.hpp" + #include "gc/z/zArray.inline.hpp" #include "gc/z/zPage.inline.hpp" -#include "gc/z/zRelocationSetSelector.hpp" inline size_t ZRelocationSetSelectorGroupStats::npages() const { return _npages; diff --git a/src/hotspot/share/gc/z/zResurrection.inline.hpp b/src/hotspot/share/gc/z/zResurrection.inline.hpp index 934f50c6c7b..325f8a1acfa 100644 --- a/src/hotspot/share/gc/z/zResurrection.inline.hpp +++ b/src/hotspot/share/gc/z/zResurrection.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZRESURRECTION_INLINE_HPP #include "gc/z/zResurrection.hpp" + #include "runtime/atomic.hpp" inline bool ZResurrection::is_blocked() { diff --git a/src/hotspot/share/gc/z/zSafeDelete.inline.hpp b/src/hotspot/share/gc/z/zSafeDelete.inline.hpp index 2a14eeb9387..9db212bd4c2 100644 --- a/src/hotspot/share/gc/z/zSafeDelete.inline.hpp +++ b/src/hotspot/share/gc/z/zSafeDelete.inline.hpp @@ -24,8 +24,9 @@ #ifndef SHARE_GC_Z_ZSAFEDELETE_INLINE_HPP #define SHARE_GC_Z_ZSAFEDELETE_INLINE_HPP -#include "gc/z/zArray.inline.hpp" #include "gc/z/zSafeDelete.hpp" + +#include "gc/z/zArray.inline.hpp" #include "metaprogramming/isArray.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/gc/z/zThread.inline.hpp b/src/hotspot/share/gc/z/zThread.inline.hpp index 95dda0ef2f7..1a88648fc75 100644 --- a/src/hotspot/share/gc/z/zThread.inline.hpp +++ b/src/hotspot/share/gc/z/zThread.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZTHREAD_INLINE_HPP #include "gc/z/zThread.hpp" + #include "utilities/debug.hpp" inline void ZThread::ensure_initialized() { diff --git a/src/hotspot/share/gc/z/zTracer.inline.hpp b/src/hotspot/share/gc/z/zTracer.inline.hpp index 3e7f62cb16a..143eebb4d3b 100644 --- a/src/hotspot/share/gc/z/zTracer.inline.hpp +++ b/src/hotspot/share/gc/z/zTracer.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_GC_Z_ZTRACER_INLINE_HPP #include "gc/z/zTracer.hpp" + #include "jfr/jfrEvents.hpp" inline ZTracer* ZTracer::tracer() { diff --git a/src/hotspot/share/gc/z/zUtils.inline.hpp b/src/hotspot/share/gc/z/zUtils.inline.hpp index ac7c357e8ab..17fc8a69bc7 100644 --- a/src/hotspot/share/gc/z/zUtils.inline.hpp +++ b/src/hotspot/share/gc/z/zUtils.inline.hpp @@ -24,8 +24,9 @@ #ifndef SHARE_GC_Z_ZUTILS_INLINE_HPP #define SHARE_GC_Z_ZUTILS_INLINE_HPP -#include "gc/z/zOop.inline.hpp" #include "gc/z/zUtils.hpp" + +#include "gc/z/zOop.inline.hpp" #include "oops/oop.inline.hpp" #include "utilities/align.hpp" #include "utilities/copy.hpp" diff --git a/src/hotspot/share/gc/z/zValue.inline.hpp b/src/hotspot/share/gc/z/zValue.inline.hpp index 6e5783048bf..1b5314a8efa 100644 --- a/src/hotspot/share/gc/z/zValue.inline.hpp +++ b/src/hotspot/share/gc/z/zValue.inline.hpp @@ -24,13 +24,14 @@ #ifndef SHARE_GC_Z_ZVALUE_INLINE_HPP #define SHARE_GC_Z_ZVALUE_INLINE_HPP +#include "gc/z/zValue.hpp" + #include "gc/shared/gc_globals.hpp" #include "gc/z/zCPU.inline.hpp" #include "gc/z/zGlobals.hpp" #include "gc/z/zNUMA.hpp" #include "gc/z/zThread.inline.hpp" #include "gc/z/zUtils.hpp" -#include "gc/z/zValue.hpp" #include "runtime/globals.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp b/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp index c4f7a5c096e..2a8c776587f 100644 --- a/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp +++ b/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp @@ -24,9 +24,10 @@ #ifndef SHARE_GC_Z_ZVIRTUALMEMORY_INLINE_HPP #define SHARE_GC_Z_ZVIRTUALMEMORY_INLINE_HPP -#include "gc/z/zMemory.inline.hpp" #include "gc/z/zVirtualMemory.hpp" +#include "gc/z/zMemory.inline.hpp" + inline ZVirtualMemory::ZVirtualMemory() : _start(UINTPTR_MAX), _end(UINTPTR_MAX) {} diff --git a/src/hotspot/share/gc/z/zWorkers.inline.hpp b/src/hotspot/share/gc/z/zWorkers.inline.hpp index cdfa7b862d8..81cab76cc45 100644 --- a/src/hotspot/share/gc/z/zWorkers.inline.hpp +++ b/src/hotspot/share/gc/z/zWorkers.inline.hpp @@ -24,8 +24,9 @@ #ifndef SHARE_GC_Z_ZWORKERS_INLINE_HPP #define SHARE_GC_Z_ZWORKERS_INLINE_HPP -#include "gc/shared/gc_globals.hpp" #include "gc/z/zWorkers.hpp" + +#include "gc/shared/gc_globals.hpp" #include "utilities/globalDefinitions.hpp" inline uint ZWorkers::nparallel() const { diff --git a/src/hotspot/share/interpreter/bytecode.inline.hpp b/src/hotspot/share/interpreter/bytecode.inline.hpp index 291fb16b8c9..1181a8eed6e 100644 --- a/src/hotspot/share/interpreter/bytecode.inline.hpp +++ b/src/hotspot/share/interpreter/bytecode.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_INTERPRETER_BYTECODE_INLINE_HPP #include "interpreter/bytecode.hpp" + #include "oops/cpCache.inline.hpp" inline bool Bytecode_invoke::has_appendix() { return cpcache_entry()->has_appendix(); } diff --git a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.inline.hpp b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.inline.hpp index 07c87708ba1..edb4ab0020c 100644 --- a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.inline.hpp +++ b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP #include "interpreter/zero/bytecodeInterpreter.hpp" + #include "runtime/stubRoutines.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/jfr/leakprofiler/chains/bitset.inline.hpp b/src/hotspot/share/jfr/leakprofiler/chains/bitset.inline.hpp index 8d0fd8a5722..e2c92d71385 100644 --- a/src/hotspot/share/jfr/leakprofiler/chains/bitset.inline.hpp +++ b/src/hotspot/share/jfr/leakprofiler/chains/bitset.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_JFR_LEAKPROFILER_CHAINS_BITSET_INLINE_HPP #include "jfr/leakprofiler/chains/bitset.hpp" + #include "jfr/recorder/storage/jfrVirtualMemory.hpp" #include "memory/memRegion.hpp" #include "utilities/bitMap.inline.hpp" diff --git a/src/hotspot/share/jfr/leakprofiler/utilities/unifiedOopRef.inline.hpp b/src/hotspot/share/jfr/leakprofiler/utilities/unifiedOopRef.inline.hpp index 3aa347d6dcf..cfa11c2ff77 100644 --- a/src/hotspot/share/jfr/leakprofiler/utilities/unifiedOopRef.inline.hpp +++ b/src/hotspot/share/jfr/leakprofiler/utilities/unifiedOopRef.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOPREF_INLINE_HPP #include "jfr/leakprofiler/utilities/unifiedOopRef.hpp" + #include "oops/access.inline.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp index 568cca717d5..4cd3feba7ae 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_INLINE_HPP #include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp" + #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp" #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp" #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp" diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp index 5d3a7953f5a..22dc54a9109 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDBITS_INLINE_HPP #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.hpp" + #include "oops/method.hpp" #include "runtime/atomic.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp index 0842e35a3aa..29bade3def6 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp @@ -25,12 +25,13 @@ #ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDBARRIER_INLINE_HPP #define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDBARRIER_INLINE_HPP +#include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.hpp" + #include "classfile/classLoaderData.hpp" #include "classfile/moduleEntry.hpp" #include "classfile/packageEntry.hpp" #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp" #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp" -#include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.hpp" #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp" #include "oops/klass.hpp" #include "oops/method.hpp" diff --git a/src/hotspot/share/jfr/recorder/storage/jfrEpochStorage.inline.hpp b/src/hotspot/share/jfr/recorder/storage/jfrEpochStorage.inline.hpp index 464d393adc1..f4b50f8e989 100644 --- a/src/hotspot/share/jfr/recorder/storage/jfrEpochStorage.inline.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrEpochStorage.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_JFR_RECORDER_STORAGE_JFREPOCHSTORAGE_INLINE_HPP #include "jfr/recorder/storage/jfrEpochStorage.hpp" + #include "jfr/recorder/storage/jfrMemorySpace.inline.hpp" #include "jfr/recorder/storage/jfrStorageUtils.inline.hpp" #include "jfr/utilities/jfrConcurrentQueue.inline.hpp" diff --git a/src/hotspot/share/jfr/recorder/storage/jfrFullStorage.inline.hpp b/src/hotspot/share/jfr/recorder/storage/jfrFullStorage.inline.hpp index aa26e045028..b9dac18bbfc 100644 --- a/src/hotspot/share/jfr/recorder/storage/jfrFullStorage.inline.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrFullStorage.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEFULLLIST_INLINE_HPP #define SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEFULLLIST_INLINE_HPP -#include "jfr/recorder/storage/jfrStorageControl.hpp" #include "jfr/recorder/storage/jfrFullStorage.hpp" + +#include "jfr/recorder/storage/jfrStorageControl.hpp" #include "jfr/utilities/jfrConcurrentQueue.inline.hpp" template class NodeType, typename AllocPolicy> diff --git a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp index 47ae658b7b2..dde81d9c188 100644 --- a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp @@ -25,8 +25,9 @@ #ifndef SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP #define SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP -#include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp" #include "jfr/recorder/storage/jfrMemorySpace.hpp" + +#include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp" #include "runtime/atomic.hpp" #include "runtime/os.hpp" diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp index f8739e02905..4ed8000d182 100644 --- a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP #include "jfr/recorder/storage/jfrStorageUtils.hpp" + #include "runtime/atomic.hpp" #include "runtime/thread.inline.hpp" diff --git a/src/hotspot/share/jfr/utilities/jfrConcurrentLinkedListHost.inline.hpp b/src/hotspot/share/jfr/utilities/jfrConcurrentLinkedListHost.inline.hpp index e8cda186f1b..31443b4d56a 100644 --- a/src/hotspot/share/jfr/utilities/jfrConcurrentLinkedListHost.inline.hpp +++ b/src/hotspot/share/jfr/utilities/jfrConcurrentLinkedListHost.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_JFR_UTILITIES_JFRCONCURRENTLINKEDLISTHOST_INLINE_HPP #include "jfr/utilities/jfrConcurrentLinkedListHost.hpp" + #include "jfr/utilities/jfrRelation.hpp" #include "jfr/utilities/jfrTypes.hpp" #include "runtime/atomic.hpp" diff --git a/src/hotspot/share/jfr/utilities/jfrConcurrentQueue.inline.hpp b/src/hotspot/share/jfr/utilities/jfrConcurrentQueue.inline.hpp index a1eba1b5569..cd6747d6d22 100644 --- a/src/hotspot/share/jfr/utilities/jfrConcurrentQueue.inline.hpp +++ b/src/hotspot/share/jfr/utilities/jfrConcurrentQueue.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_JFR_UTILITIES_JFRCONCURRENTQUEUE_INLINE_HPP #include "jfr/utilities/jfrConcurrentQueue.hpp" + #include "jfr/utilities/jfrConcurrentLinkedListHost.inline.hpp" #include "jfr/utilities/jfrVersionSystem.inline.hpp" diff --git a/src/hotspot/share/jfr/utilities/jfrEpochQueue.inline.hpp b/src/hotspot/share/jfr/utilities/jfrEpochQueue.inline.hpp index ba4727c2c08..454934a83cd 100644 --- a/src/hotspot/share/jfr/utilities/jfrEpochQueue.inline.hpp +++ b/src/hotspot/share/jfr/utilities/jfrEpochQueue.inline.hpp @@ -25,9 +25,10 @@ #ifndef SHARE_JFR_UTILITIES_JFREPOCHQUEUE_INLINE_HPP #define SHARE_JFR_UTILITIES_JFREPOCHQUEUE_INLINE_HPP +#include "jfr/utilities/jfrEpochQueue.hpp" + #include "jfr/recorder/storage/jfrEpochStorage.inline.hpp" #include "jfr/recorder/storage/jfrStorageUtils.inline.hpp" -#include "jfr/utilities/jfrEpochQueue.hpp" #include "runtime/thread.inline.hpp" template