8267464: Circular-dependency resilient inline headers

Reviewed-by: kbarrett, eosterlund, dholmes, kvn

doc/hotspot-style.html

@@ -94,6 +94,7 @@
 <li><p>All source files must have a globally unique basename. The build system depends on this uniqueness.</p></li>
 <li><p>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.</p></li>
 <li><p>.inline.hpp files should only be included in .cpp or .inline.hpp files.</p></li>
+<li><p>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.</p></li>
 <li><p>All .cpp files include precompiled.hpp as the first include line.</p></li>
 <li><p>precompiled.hpp is just a build time optimization, so don't rely on it to resolve include problems.</p></li>
 <li><p>Keep the include lines alphabetically sorted.</p></li>

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

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"

src/hotspot/cpu/arm/icBuffer_arm.cpp

@@ -23,8 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/assembler.hpp"
+#include "asm/assembler.inline.hpp"
-#include "assembler_arm.inline.hpp"
 #include "code/icBuffer.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "interpreter/bytecodes.hpp"

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->

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"

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"

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"

src/hotspot/cpu/arm/runtime_arm.cpp

@@ -24,8 +24,7 @@
 
 #include "precompiled.hpp"
 #ifdef COMPILER2
-#include "asm/assembler.hpp"
+#include "asm/assembler.inline.hpp"
-#include "assembler_arm.inline.hpp"
 #include "code/vmreg.hpp"
 #include "compiler/oopMap.hpp"
 #include "interpreter/interpreter.hpp"

src/hotspot/cpu/arm/sharedRuntime_arm.cpp

@@ -23,8 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/assembler.hpp"
+#include "asm/assembler.inline.hpp"
-#include "assembler_arm.inline.hpp"
 #include "code/debugInfoRec.hpp"
 #include "code/icBuffer.hpp"
 #include "code/vtableStubs.hpp"

src/hotspot/cpu/arm/stubGenerator_arm.cpp

@@ -23,8 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/assembler.hpp"
+#include "asm/assembler.inline.hpp"
-#include "assembler_arm.inline.hpp"
 #include "compiler/oopMap.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"

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"

src/hotspot/cpu/ppc/icBuffer_ppc.cpp

@@ -24,8 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/assembler.hpp"
+#include "asm/assembler.inline.hpp"
-#include "assembler_ppc.inline.hpp"
 #include "code/icBuffer.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "interpreter/bytecodes.hpp"

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"

src/hotspot/cpu/zero/icBuffer_zero.cpp

@@ -24,8 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/assembler.hpp"
+#include "asm/assembler.inline.hpp"
-#include "assembler_zero.inline.hpp"
 #include "code/icBuffer.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "interpreter/bytecodes.hpp"

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(

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"

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"

src/hotspot/cpu/zero/sharedRuntime_zero.cpp

@@ -24,8 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/assembler.hpp"
+#include "asm/assembler.inline.hpp"
-#include "assembler_zero.inline.hpp"
 #include "code/debugInfoRec.hpp"
 #include "code/icBuffer.hpp"
 #include "code/vtableStubs.hpp"

src/hotspot/cpu/zero/stubGenerator_zero.cpp

@@ -24,8 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/assembler.hpp"
+#include "asm/assembler.inline.hpp"
-#include "assembler_zero.inline.hpp"
 #include "interpreter/interpreter.hpp"
 #include "nativeInst_zero.hpp"
 #include "oops/instanceOop.hpp"

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"

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"
 

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"
 

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"
 

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 <unistd.h>

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"
 

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"

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"

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"

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

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()) {

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) {

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"

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?

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"
 

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"

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"

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"

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"

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 <class T>

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

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)                                  \

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"

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"

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"

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) {

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"

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
+#endif // SHARE_GC_G1_G1COMMITTEDREGIONMAP_INLINE_HPP

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"

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"

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"

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();

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) {

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"
 

src/hotspot/share/gc/g1/g1FullGCMarker.hpp

@@ -46,6 +46,7 @@ typedef GenericTaskQueueSet<ObjArrayTaskQueue, mtGC> ObjArrayTaskQueueSet;
 
 class G1CMBitMap;
 class G1FullCollector;
+class TaskTerminator;
 
 class G1FullGCMarker : public CHeapObj<mtGC> {
   G1FullCollector*   _collector;

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"

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"

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"

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"

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"

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) {

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"

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 {

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"

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");

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);
 }

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"
 

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"
 

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"

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"

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"

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"
 

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"

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"

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"

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"

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 <typename OopClosureType1, typename OopClosureType2>

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,

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

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"

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"
 

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 {

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"
 

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"

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) {

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"

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() {

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"

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"
 

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"

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"

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"

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"
 

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 <typename Closure>

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"

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"
 

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"
 

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"

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"
 

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"