8325082: Rename headers named 'heapRegion*' of G1

Reviewed-by: stefank, tschatzl

src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp

@@ -28,8 +28,8 @@
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1CardTable.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "runtime/javaThread.hpp"

src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp

@@ -29,8 +29,8 @@
 #include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/g1CardTable.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/sharedRuntime.hpp"

src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp

@@ -30,9 +30,9 @@
 #include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1DirtyCardQueue.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1SATBMarkQueueSet.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "runtime/jniHandles.hpp"
 #include "runtime/sharedRuntime.hpp"

src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp

@@ -29,8 +29,8 @@
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1CardTable.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "runtime/javaThread.hpp"

src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp

@@ -31,9 +31,9 @@
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1DirtyCardQueue.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1SATBMarkQueueSet.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "runtime/jniHandles.hpp"
 #include "runtime/sharedRuntime.hpp"

src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp

@@ -28,8 +28,8 @@
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1CardTable.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "utilities/debug.hpp"

src/hotspot/share/cds/archiveHeapWriter.cpp

@@ -44,7 +44,7 @@
 
 #if INCLUDE_G1GC
 #include "gc/g1/g1CollectedHeap.hpp"
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #endif
 
 #if INCLUDE_CDS_JAVA_HEAP

src/hotspot/share/cds/filemap.cpp

@@ -71,7 +71,7 @@
 #include "utilities/ostream.hpp"
 #if INCLUDE_G1GC
 #include "gc/g1/g1CollectedHeap.hpp"
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #endif
 
 # include <sys/stat.h>

src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp

@@ -28,8 +28,8 @@
 #include "gc/g1/c1/g1BarrierSetC1.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BarrierSetAssembler.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "utilities/macros.hpp"
 
 #ifdef ASSERT

src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp

@@ -29,7 +29,7 @@
 #include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "opto/arraycopynode.hpp"
 #include "opto/compile.hpp"
 #include "opto/escape.hpp"

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

@@ -25,8 +25,8 @@
 #ifndef SHARE_GC_G1_G1ALLOCREGION_HPP
 #define SHARE_GC_G1_G1ALLOCREGION_HPP
 
-#include "gc/g1/heapRegion.hpp"
 #include "gc/g1/g1EvacStats.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1HeapRegionAttr.hpp"
 #include "gc/g1/g1NUMA.hpp"
 

src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp

@@ -27,7 +27,7 @@
 
 #include "gc/g1/g1AllocRegion.hpp"
 
-#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
 
 #define assert_alloc_region(p, message)                                  \
   do {                                                                   \

src/hotspot/share/gc/g1/g1Allocator.cpp

@@ -28,11 +28,11 @@
 #include "gc/g1/g1EvacInfo.hpp"
 #include "gc/g1/g1EvacStats.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionSet.inline.hpp"
+#include "gc/g1/g1HeapRegionType.hpp"
 #include "gc/g1/g1NUMA.hpp"
 #include "gc/g1/g1Policy.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/g1/heapRegionSet.inline.hpp"
-#include "gc/g1/heapRegionType.hpp"
 #include "gc/shared/tlab_globals.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "utilities/align.hpp"

src/hotspot/share/gc/g1/g1Arguments.cpp

@@ -29,10 +29,10 @@
 #include "gc/g1/g1CardSet.hpp"
 #include "gc/g1/g1CardSetContainers.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
+#include "gc/g1/g1HeapRegionBounds.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
-#include "gc/g1/heapRegion.hpp"
-#include "gc/g1/heapRegionBounds.inline.hpp"
-#include "gc/g1/heapRegionRemSet.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/gcArguments.hpp"
 #include "gc/shared/workerPolicy.hpp"

src/hotspot/share/gc/g1/g1BarrierSet.cpp

@@ -27,10 +27,10 @@
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1CardTable.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1RegionPinCache.inline.hpp"
 #include "gc/g1/g1SATBMarkQueueSet.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "gc/shared/satbMarkQueue.hpp"
 #include "logging/log.hpp"
 #include "oops/access.inline.hpp"

src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp

@@ -25,7 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/g1/g1BlockOffsetTable.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
 #include "logging/log.hpp"
 #include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"

src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp

@@ -27,7 +27,7 @@
 
 #include "gc/g1/g1BlockOffsetTable.hpp"
 
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/shared/memset_with_concurrent_readers.hpp"
 #include "runtime/atomic.hpp"
 #include "oops/oop.inline.hpp"

src/hotspot/share/gc/g1/g1CardSet.cpp

@@ -26,7 +26,7 @@
 #include "gc/g1/g1CardSet.inline.hpp"
 #include "gc/g1/g1CardSetContainers.inline.hpp"
 #include "gc/g1/g1CardSetMemory.inline.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/shared/gcLogPrecious.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "memory/allocation.inline.hpp"

src/hotspot/share/gc/g1/g1CardTable.inline.hpp

@@ -27,7 +27,7 @@
 
 #include "gc/g1/g1CardTable.hpp"
 
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 
 inline uint G1CardTable::region_idx_for(CardValue* p) {
   size_t const card_idx = pointer_delta(p, _byte_map, sizeof(CardValue));

src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp

@@ -27,8 +27,8 @@
 #include "gc/g1/g1CodeBlobClosure.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentMark.inline.hpp"
-#include "gc/g1/heapRegion.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"

src/hotspot/share/gc/g1/g1CodeRootSet.cpp

@@ -27,7 +27,7 @@
 #include "code/codeCache.hpp"
 #include "code/nmethod.hpp"
 #include "gc/g1/g1CodeRootSet.hpp"
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "memory/allocation.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"

src/hotspot/share/gc/g1/g1CollectedHeap.cpp

@@ -46,6 +46,9 @@
 #include "gc/g1/g1GCParPhaseTimesTracker.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
 #include "gc/g1/g1GCPauseType.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
+#include "gc/g1/g1HeapRegionSet.inline.hpp"
 #include "gc/g1/g1HeapSizingPolicy.hpp"
 #include "gc/g1/g1HeapTransition.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
@@ -71,9 +74,6 @@
 #include "gc/g1/g1VMOperations.hpp"
 #include "gc/g1/g1YoungCollector.hpp"
 #include "gc/g1/g1YoungGCAllocationFailureInjector.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
-#include "gc/g1/heapRegionSet.inline.hpp"
 #include "gc/shared/classUnloadingContext.hpp"
 #include "gc/shared/concurrentGCBreakpoints.hpp"
 #include "gc/shared/gcBehaviours.hpp"

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

@@ -36,6 +36,8 @@
 #include "gc/g1/g1EvacStats.hpp"
 #include "gc/g1/g1GCPauseType.hpp"
 #include "gc/g1/g1HeapRegionAttr.hpp"
+#include "gc/g1/g1HeapRegionManager.hpp"
+#include "gc/g1/g1HeapRegionSet.hpp"
 #include "gc/g1/g1HeapTransition.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
 #include "gc/g1/g1HRPrinter.hpp"
@@ -45,8 +47,6 @@
 #include "gc/g1/g1NUMA.hpp"
 #include "gc/g1/g1SurvivorRegions.hpp"
 #include "gc/g1/g1YoungGCAllocationFailureInjector.hpp"
-#include "gc/g1/heapRegionManager.hpp"
-#include "gc/g1/heapRegionSet.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/gcHeapSummary.hpp"

src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp

@@ -31,13 +31,13 @@
 #include "gc/g1/g1CollectorState.hpp"
 #include "gc/g1/g1ConcurrentMark.inline.hpp"
 #include "gc/g1/g1EvacFailureRegions.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionManager.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.hpp"
+#include "gc/g1/g1HeapRegionSet.inline.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RegionPinCache.inline.hpp"
 #include "gc/g1/g1RemSet.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/g1/heapRegionManager.inline.hpp"
-#include "gc/g1/heapRegionRemSet.hpp"
-#include "gc/g1/heapRegionSet.inline.hpp"
 #include "gc/shared/markBitMap.inline.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
 #include "oops/stackChunkOop.hpp"

src/hotspot/share/gc/g1/g1CollectionSet.cpp

@@ -28,11 +28,11 @@
 #include "gc/g1/g1CollectionSet.hpp"
 #include "gc/g1/g1CollectionSetCandidates.hpp"
 #include "gc/g1/g1CollectorState.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
+#include "gc/g1/g1HeapRegionSet.hpp"
 #include "gc/g1/g1ParScanThreadState.hpp"
 #include "gc/g1/g1Policy.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
-#include "gc/g1/heapRegionSet.hpp"
 #include "logging/logStream.hpp"
 #include "runtime/orderAccess.hpp"
 #include "utilities/debug.hpp"

src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp

@@ -25,7 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/g1/g1CollectionSetCandidates.hpp"
 #include "gc/g1/g1CollectionSetChooser.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/growableArray.hpp"
 

src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp

@@ -26,7 +26,7 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1CollectionSetCandidates.hpp"
 #include "gc/g1/g1CollectionSetChooser.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/shared/space.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "utilities/quickSort.hpp"

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

@@ -25,7 +25,7 @@
 #ifndef SHARE_GC_G1_G1COLLECTIONSETCHOOSER_HPP
 #define SHARE_GC_G1_G1COLLECTIONSETCHOOSER_HPP
 
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "memory/allStatic.hpp"
 #include "runtime/globals.hpp"

src/hotspot/share/gc/g1/g1ConcurrentMark.cpp

@@ -34,16 +34,16 @@
 #include "gc/g1/g1ConcurrentMarkThread.inline.hpp"
 #include "gc/g1/g1ConcurrentRebuildAndScrub.hpp"
 #include "gc/g1/g1DirtyCardQueue.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionManager.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
+#include "gc/g1/g1HeapRegionSet.inline.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
 #include "gc/g1/g1OopClosures.inline.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RegionMarkStatsCache.inline.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/g1Trace.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/g1/heapRegionManager.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
-#include "gc/g1/heapRegionSet.inline.hpp"
 #include "gc/shared/gcId.hpp"
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"

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

@@ -27,9 +27,9 @@
 
 #include "gc/g1/g1ConcurrentMarkBitMap.hpp"
 #include "gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp"
+#include "gc/g1/g1HeapRegionSet.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
 #include "gc/g1/g1RegionMarkStatsCache.hpp"
-#include "gc/g1/heapRegionSet.hpp"
 #include "gc/shared/gcCause.hpp"
 #include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/taskqueue.hpp"

src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp

@@ -30,12 +30,12 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
 #include "gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1OopClosures.inline.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RegionMarkStatsCache.inline.hpp"
 #include "gc/g1/g1RemSetTrackingPolicy.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
 #include "utilities/bitMap.inline.hpp"

src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.cpp

@@ -25,7 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "memory/virtualspace.hpp"
 
 G1CMBitMap::G1CMBitMap() : MarkBitMap(), _listener() {

src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp

@@ -26,7 +26,7 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentMark.inline.hpp"
 #include "gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "memory/memRegion.hpp"
 #include "utilities/globalDefinitions.hpp"

src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp

@@ -28,9 +28,9 @@
 
 #include "gc/g1/g1ConcurrentMark.inline.hpp"
 #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionManager.inline.hpp"
 #include "gc/g1/g1_globals.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/g1/heapRegionManager.inline.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "logging/log.hpp"

src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp

@@ -28,9 +28,9 @@
 #include "gc/g1/g1ConcurrentRefine.hpp"
 #include "gc/g1/g1ConcurrentRefineThread.hpp"
 #include "gc/g1/g1DirtyCardQueue.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1Policy.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"

src/hotspot/share/gc/g1/g1ConcurrentRefineThreadsNeeded.cpp

@@ -25,7 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/g1/g1Analytics.hpp"
 #include "gc/g1/g1ConcurrentRefineThreadsNeeded.hpp"
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include <math.h>

src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp

@@ -30,10 +30,10 @@
 #include "gc/g1/g1ConcurrentRefineThread.hpp"
 #include "gc/g1/g1DirtyCardQueue.hpp"
 #include "gc/g1/g1FreeIdSet.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1RedirtyCardsQueue.hpp"
 #include "gc/g1/g1RemSet.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
 #include "gc/shared/bufferNode.hpp"
 #include "gc/shared/bufferNodeList.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"

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

@@ -26,7 +26,7 @@
 #define SHARE_GC_G1_G1EDENREGIONS_HPP
 
 #include "gc/g1/g1RegionsOnNodes.hpp"
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/debug.hpp"
 

src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp

@@ -27,7 +27,7 @@
 #include "gc/g1/g1BatchedTask.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1EvacFailureRegions.inline.hpp"
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "memory/allocation.hpp"
 #include "runtime/atomic.hpp"
 #include "utilities/bitMap.inline.hpp"

src/hotspot/share/gc/g1/g1FullCollector.inline.hpp

@@ -28,7 +28,7 @@
 #include "gc/g1/g1FullCollector.hpp"
 
 #include "gc/g1/g1FullGCHeapRegionAttr.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/atomic.hpp"
 

src/hotspot/share/gc/g1/g1FullGCAdjustTask.cpp

@@ -32,7 +32,7 @@
 #include "gc/g1/g1FullGCCompactionPoint.hpp"
 #include "gc/g1/g1FullGCMarker.hpp"
 #include "gc/g1/g1FullGCOopClosures.inline.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/weakProcessor.inline.hpp"

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

@@ -27,8 +27,8 @@
 
 #include "gc/g1/g1FullGCOopClosures.hpp"
 #include "gc/g1/g1FullGCTask.hpp"
+#include "gc/g1/g1HeapRegionManager.hpp"
 #include "gc/g1/g1RootProcessor.hpp"
-#include "gc/g1/heapRegionManager.hpp"
 #include "gc/shared/weakProcessor.hpp"
 #include "utilities/ticks.hpp"
 

src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp

@@ -28,7 +28,7 @@
 #include "gc/g1/g1FullCollector.inline.hpp"
 #include "gc/g1/g1FullGCCompactionPoint.hpp"
 #include "gc/g1/g1FullGCCompactTask.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"

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

@@ -28,7 +28,7 @@
 #include "gc/g1/g1FullGCCompactionPoint.hpp"
 #include "gc/g1/g1FullGCScope.hpp"
 #include "gc/g1/g1FullGCTask.hpp"
-#include "gc/g1/heapRegionManager.hpp"
+#include "gc/g1/g1HeapRegionManager.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 
 class G1CollectedHeap;

src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp

@@ -25,7 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/g1/g1FullCollector.inline.hpp"
 #include "gc/g1/g1FullGCCompactionPoint.hpp"
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/shared/preservedMarks.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "utilities/debug.hpp"

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

@@ -28,8 +28,8 @@
 #include "gc/g1/g1FullGCCompactionPoint.hpp"
 #include "gc/g1/g1FullGCScope.hpp"
 #include "gc/g1/g1FullGCTask.hpp"
+#include "gc/g1/g1HeapRegionManager.hpp"
 #include "gc/g1/g1RootProcessor.hpp"
-#include "gc/g1/heapRegionManager.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 #include "utilities/ticks.hpp"
 

src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp

@@ -28,10 +28,10 @@
 #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/g1FullCollector.inline.hpp"
 #include "gc/g1/g1FullGCMarker.inline.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/universe.hpp"
 #include "oops/access.inline.hpp"

src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp

@@ -30,7 +30,7 @@
 #include "gc/g1/g1FullGCMarker.hpp"
 #include "gc/g1/g1FullGCOopClosures.inline.hpp"
 #include "gc/g1/g1FullGCPrepareTask.inline.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 #include "logging/log.hpp"

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

@@ -26,7 +26,7 @@
 #define SHARE_GC_G1_G1FULLGCPREPARETASK_HPP
 
 #include "gc/g1/g1FullGCTask.hpp"
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "memory/allocation.hpp"
 
 class G1CollectedHeap;

src/hotspot/share/gc/g1/g1FullGCPrepareTask.inline.hpp

@@ -31,7 +31,7 @@
 #include "gc/g1/g1FullCollector.hpp"
 #include "gc/g1/g1FullGCCompactionPoint.hpp"
 #include "gc/g1/g1FullGCScope.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
 
 void G1DetermineCompactionQueueClosure::free_empty_humongous_region(HeapRegion* hr) {
   _g1h->free_humongous_region(hr, nullptr);

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

@@ -25,7 +25,7 @@
 #ifndef SHARE_GC_G1_G1FULLGCRESETMETADATATASK_HPP
 #define SHARE_GC_G1_G1FULLGCRESETMETADATATASK_HPP
 #include "gc/g1/g1FullGCTask.hpp"
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 
 class G1FullGCResetMetadataTask : public G1FullGCTask {
   G1FullCollector* _collector;

src/hotspot/share/gc/g1/g1HRPrinter.cpp

@@ -24,8 +24,8 @@
 
 #include "precompiled.hpp"
 
+#include "gc/g1/g1HeapRegionSet.hpp"
 #include "gc/g1/g1HRPrinter.hpp"
-#include "gc/g1/heapRegionSet.hpp"
 
 void G1HRPrinter::cleanup(FreeRegionList* cleanup_list) {
   if (is_active()) {

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

@@ -25,7 +25,7 @@
 #ifndef SHARE_GC_G1_G1HRPRINTER_HPP
 #define SHARE_GC_G1_G1HRPRINTER_HPP
 
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "logging/log.hpp"
 
 #define SKIP_RETIRED_FULL_REGIONS 1

src/hotspot/share/gc/g1/g1HeapRegion.cpp

@@ -29,14 +29,14 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1CollectionSet.hpp"
 #include "gc/g1/g1CollectionSetCandidates.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionBounds.inline.hpp"
+#include "gc/g1/g1HeapRegionManager.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
+#include "gc/g1/g1HeapRegionTracer.hpp"
 #include "gc/g1/g1HeapRegionTraceType.hpp"
 #include "gc/g1/g1NUMA.hpp"
 #include "gc/g1/g1OopClosures.inline.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/g1/heapRegionBounds.inline.hpp"
-#include "gc/g1/heapRegionManager.inline.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
-#include "gc/g1/heapRegionTracer.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/iterator.inline.hpp"

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

@@ -22,14 +22,14 @@
  *
  */
 
-#ifndef SHARE_GC_G1_HEAPREGION_HPP
-#define SHARE_GC_G1_HEAPREGION_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGION_HPP
+#define SHARE_GC_G1_G1HEAPREGION_HPP
 
 #include "gc/g1/g1BlockOffsetTable.hpp"
+#include "gc/g1/g1HeapRegionTracer.hpp"
 #include "gc/g1/g1HeapRegionTraceType.hpp"
+#include "gc/g1/g1HeapRegionType.hpp"
 #include "gc/g1/g1SurvRateGroup.hpp"
-#include "gc/g1/heapRegionTracer.hpp"
-#include "gc/g1/heapRegionType.hpp"
 #include "gc/shared/ageTable.hpp"
 #include "gc/shared/spaceDecorator.hpp"
 #include "gc/shared/verifyOption.hpp"
@@ -622,4 +622,4 @@ public:
   bool is_complete() { return _is_complete; }
 };
 
-#endif // SHARE_GC_G1_HEAPREGION_HPP
+#endif // SHARE_GC_G1_G1HEAPREGION_HPP

src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp

@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef SHARE_GC_G1_HEAPREGION_INLINE_HPP
-#define SHARE_GC_G1_HEAPREGION_INLINE_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGION_INLINE_HPP
+#define SHARE_GC_G1_G1HEAPREGION_INLINE_HPP
 
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 
 #include "classfile/vmClasses.hpp"
 #include "gc/g1/g1BlockOffsetTable.inline.hpp"
@@ -559,4 +559,4 @@ inline void HeapRegion::add_pinned_object_count(size_t value) {
   Atomic::add(&_pinned_object_count, value, memory_order_relaxed);
 }
 
-#endif // SHARE_GC_G1_HEAPREGION_INLINE_HPP
+#endif // SHARE_GC_G1_G1HEAPREGION_INLINE_HPP

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

@@ -26,7 +26,7 @@
 #define SHARE_GC_G1_G1HEAPREGIONATTR_HPP
 
 #include "gc/g1/g1BiasedArray.hpp"
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 
 // Per-region attributes often used during garbage collection to avoid costly
 // lookups for that information all over the place.

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

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_G1_HEAPREGIONBOUNDS_HPP
-#define SHARE_GC_G1_HEAPREGIONBOUNDS_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGIONBOUNDS_HPP
+#define SHARE_GC_G1_G1HEAPREGIONBOUNDS_HPP
 
 #include "memory/allStatic.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -55,4 +55,4 @@ public:
   static inline size_t target_number();
 };
 
-#endif // SHARE_GC_G1_HEAPREGIONBOUNDS_HPP
+#endif // SHARE_GC_G1_G1HEAPREGIONBOUNDS_HPP

src/hotspot/share/gc/g1/g1HeapRegionBounds.inline.hpp

@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef SHARE_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
-#define SHARE_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGIONBOUNDS_INLINE_HPP
+#define SHARE_GC_G1_G1HEAPREGIONBOUNDS_INLINE_HPP
 
-#include "gc/g1/heapRegionBounds.hpp"
+#include "gc/g1/g1HeapRegionBounds.hpp"
 
 size_t HeapRegionBounds::min_size() {
   return MIN_REGION_SIZE;
@@ -43,4 +43,4 @@ size_t HeapRegionBounds::target_number() {
   return TARGET_REGION_NUMBER;
 }
 
-#endif // SHARE_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
+#endif // SHARE_GC_G1_G1HEAPREGIONBOUNDS_INLINE_HPP

src/hotspot/share/gc/g1/g1HeapRegionEventSender.cpp

@@ -24,8 +24,8 @@
 
 #include "precompiled.hpp"
 #include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1HeapRegionEventSender.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "runtime/vmThread.hpp"

src/hotspot/share/gc/g1/g1HeapRegionManager.cpp

@@ -27,10 +27,10 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentRefine.hpp"
 #include "gc/g1/g1CommittedRegionMap.inline.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
+#include "gc/g1/g1HeapRegionManager.inline.hpp"
+#include "gc/g1/g1HeapRegionSet.inline.hpp"
 #include "gc/g1/g1NUMAStats.hpp"
-#include "gc/g1/heapRegion.hpp"
-#include "gc/g1/heapRegionManager.inline.hpp"
-#include "gc/g1/heapRegionSet.inline.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.hpp"

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

@@ -22,13 +22,13 @@
  *
  */
 
-#ifndef SHARE_GC_G1_HEAPREGIONMANAGER_HPP
-#define SHARE_GC_G1_HEAPREGIONMANAGER_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGIONMANAGER_HPP
+#define SHARE_GC_G1_G1HEAPREGIONMANAGER_HPP
 
 #include "gc/g1/g1BiasedArray.hpp"
 #include "gc/g1/g1CommittedRegionMap.hpp"
+#include "gc/g1/g1HeapRegionSet.hpp"
 #include "gc/g1/g1RegionToSpaceMapper.hpp"
-#include "gc/g1/heapRegionSet.hpp"
 #include "memory/allocation.hpp"
 #include "services/memoryUsage.hpp"
 
@@ -326,4 +326,4 @@ class HeapRegionClaimer : public StackObj {
   // Claim the given region, returns true if successfully claimed.
   bool claim_region(uint region_index);
 };
-#endif // SHARE_GC_G1_HEAPREGIONMANAGER_HPP
+#endif // SHARE_GC_G1_G1HEAPREGIONMANAGER_HPP

src/hotspot/share/gc/g1/g1HeapRegionManager.inline.hpp

@@ -22,14 +22,14 @@
  *
  */
 
-#ifndef SHARE_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
-#define SHARE_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGIONMANAGER_INLINE_HPP
+#define SHARE_GC_G1_G1HEAPREGIONMANAGER_INLINE_HPP
 
-#include "gc/g1/heapRegionManager.hpp"
+#include "gc/g1/g1HeapRegionManager.hpp"
 
 #include "gc/g1/g1CommittedRegionMap.inline.hpp"
-#include "gc/g1/heapRegion.hpp"
-#include "gc/g1/heapRegionSet.inline.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
+#include "gc/g1/g1HeapRegionSet.inline.hpp"
 
 inline bool HeapRegionManager::is_available(uint region) const {
   return _committed_map.active(region);
@@ -83,4 +83,4 @@ inline HeapRegion* HeapRegionManager::allocate_free_regions_starting_at(uint fir
   return start;
 }
 
-#endif // SHARE_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
+#endif // SHARE_GC_G1_G1HEAPREGIONMANAGER_INLINE_HPP

src/hotspot/share/gc/g1/g1HeapRegionRemSet.cpp

@@ -29,8 +29,8 @@
 #include "gc/g1/g1CardSetContainers.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentRefine.hpp"
-#include "gc/g1/heapRegionManager.inline.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
+#include "gc/g1/g1HeapRegionManager.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "memory/allocation.hpp"
 #include "memory/padded.inline.hpp"
 #include "oops/oop.inline.hpp"

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

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_G1_HEAPREGIONREMSET_HPP
-#define SHARE_GC_G1_HEAPREGIONREMSET_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGIONREMSET_HPP
+#define SHARE_GC_G1_G1HEAPREGIONREMSET_HPP
 
 #include "gc/g1/g1CardSet.hpp"
 #include "gc/g1/g1CardSetMemory.hpp"
@@ -185,4 +185,4 @@ public:
 #endif
 };
 
-#endif // SHARE_GC_G1_HEAPREGIONREMSET_HPP
+#endif // SHARE_GC_G1_G1HEAPREGIONREMSET_HPP

src/hotspot/share/gc/g1/g1HeapRegionRemSet.inline.hpp

@@ -22,14 +22,14 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_HEAPREGIONREMSET_INLINE_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONREMSET_INLINE_HPP
+#ifndef SHARE_VM_GC_G1_G1HEAPREGIONREMSET_INLINE_HPP
+#define SHARE_VM_GC_G1_G1HEAPREGIONREMSET_INLINE_HPP
 
-#include "gc/g1/heapRegionRemSet.hpp"
+#include "gc/g1/g1HeapRegionRemSet.hpp"
 
 #include "gc/g1/g1CardSet.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "utilities/bitMap.inline.hpp"
 
@@ -144,4 +144,4 @@ void HeapRegionRemSet::print_info(outputStream* st, OopOrNarrowOopStar from) {
   _card_set.print_info(st, to_card(from));
 }
 
-#endif // SHARE_VM_GC_G1_HEAPREGIONREMSET_INLINE_HPP
+#endif // SHARE_VM_GC_G1_G1HEAPREGIONREMSET_INLINE_HPP

src/hotspot/share/gc/g1/g1HeapRegionSet.cpp

@@ -24,9 +24,9 @@
 
 #include "precompiled.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
+#include "gc/g1/g1HeapRegionSet.inline.hpp"
 #include "gc/g1/g1NUMA.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
-#include "gc/g1/heapRegionSet.inline.hpp"
 
 uint FreeRegionList::_unrealistically_long_length = 0;
 

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

@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef SHARE_GC_G1_HEAPREGIONSET_HPP
-#define SHARE_GC_G1_HEAPREGIONSET_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGIONSET_HPP
+#define SHARE_GC_G1_G1HEAPREGIONSET_HPP
 
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "utilities/macros.hpp"
 
 #define assert_heap_region_set(p, message) \
@@ -271,4 +271,4 @@ public:
   }
 };
 
-#endif // SHARE_GC_G1_HEAPREGIONSET_HPP
+#endif // SHARE_GC_G1_G1HEAPREGIONSET_HPP

src/hotspot/share/gc/g1/g1HeapRegionSet.inline.hpp

@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef SHARE_GC_G1_HEAPREGIONSET_INLINE_HPP
-#define SHARE_GC_G1_HEAPREGIONSET_INLINE_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGIONSET_INLINE_HPP
+#define SHARE_GC_G1_G1HEAPREGIONSET_INLINE_HPP
 
-#include "gc/g1/heapRegionSet.hpp"
+#include "gc/g1/g1HeapRegionSet.hpp"
 
 #include "gc/g1/g1NUMA.hpp"
 
@@ -271,4 +271,4 @@ inline uint FreeRegionList::length(uint node_index) const {
   }
 }
 
-#endif // SHARE_GC_G1_HEAPREGIONSET_INLINE_HPP
+#endif // SHARE_GC_G1_G1HEAPREGIONSET_INLINE_HPP

src/hotspot/share/gc/g1/g1HeapRegionTracer.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/g1/heapRegionTracer.hpp"
+#include "gc/g1/g1HeapRegionTracer.hpp"
 #include "jfr/jfrEvents.hpp"
 
 void HeapRegionTracer::send_region_type_change(uint index,

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

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_G1_HEAPREGIONTRACER_HPP
-#define SHARE_GC_G1_HEAPREGIONTRACER_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGIONTRACER_HPP
+#define SHARE_GC_G1_G1HEAPREGIONTRACER_HPP
 
 #include "gc/g1/g1HeapRegionTraceType.hpp"
 #include "memory/allStatic.hpp"
@@ -38,4 +38,4 @@ class HeapRegionTracer : AllStatic {
                                         size_t used);
 };
 
-#endif // SHARE_GC_G1_HEAPREGIONTRACER_HPP
+#endif // SHARE_GC_G1_G1HEAPREGIONTRACER_HPP

src/hotspot/share/gc/g1/g1HeapRegionType.cpp

@@ -24,7 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/g1/g1HeapRegionTraceType.hpp"
-#include "gc/g1/heapRegionType.hpp"
+#include "gc/g1/g1HeapRegionType.hpp"
 
 const HeapRegionType HeapRegionType::Eden      = HeapRegionType(EdenTag);
 const HeapRegionType HeapRegionType::Survivor  = HeapRegionType(SurvTag);

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

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_G1_HEAPREGIONTYPE_HPP
-#define SHARE_GC_G1_HEAPREGIONTYPE_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGIONTYPE_HPP
+#define SHARE_GC_G1_G1HEAPREGIONTYPE_HPP
 
 #include "gc/g1/g1HeapRegionTraceType.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -167,4 +167,4 @@ public:
   static const HeapRegionType Humongous;
 };
 
-#endif // SHARE_GC_G1_HEAPREGIONTYPE_HPP
+#endif // SHARE_GC_G1_G1HEAPREGIONTYPE_HPP

src/hotspot/share/gc/g1/g1HeapVerifier.cpp

@@ -27,12 +27,12 @@
 #include "gc/g1/g1Allocator.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentMarkThread.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RemSet.hpp"
 #include "gc/g1/g1RootProcessor.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/g1/heapRegionRemSet.hpp"
 #include "gc/shared/tlab_globals.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"

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

@@ -25,7 +25,7 @@
 #ifndef SHARE_GC_G1_G1HEAPVERIFIER_HPP
 #define SHARE_GC_G1_G1HEAPVERIFIER_HPP
 
-#include "gc/g1/heapRegionSet.hpp"
+#include "gc/g1/g1HeapRegionSet.hpp"
 #include "gc/shared/verifyOption.hpp"
 #include "memory/allocation.hpp"
 #include "utilities/macros.hpp"

src/hotspot/share/gc/g1/g1MemoryPool.cpp

@@ -24,8 +24,8 @@
 
 #include "precompiled.hpp"
 #include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1MemoryPool.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "gc/shared/gc_globals.hpp"
 
 G1MemoryPoolSuper::G1MemoryPoolSuper(G1CollectedHeap* g1h,

src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp

@@ -26,10 +26,10 @@
 #include "ci/ciUtilities.hpp"
 #include "gc/g1/g1CardSetMemory.inline.hpp"
 #include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/g1HeapRegionRemSet.hpp"
 #include "gc/g1/g1MonotonicArenaFreeMemoryTask.hpp"
 #include "gc/g1/g1MonotonicArenaFreePool.hpp"
 #include "gc/g1/g1_globals.hpp"
-#include "gc/g1/heapRegionRemSet.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"

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

@@ -26,9 +26,9 @@
 #define SHARE_GC_G1_G1MONOTONICARENAFREEMEMORYTASK_HPP
 
 #include "gc/g1/g1CardSetMemory.hpp"
+#include "gc/g1/g1HeapRegionRemSet.hpp"
 #include "gc/g1/g1MonotonicArenaFreePool.hpp"
 #include "gc/g1/g1ServiceThread.hpp"
-#include "gc/g1/heapRegionRemSet.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/ticks.hpp"
 

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

@@ -25,8 +25,8 @@
 #ifndef SHARE_VM_GC_G1_NUMA_HPP
 #define SHARE_VM_GC_G1_NUMA_HPP
 
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1NUMAStats.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "memory/allocation.hpp"
 #include "runtime/os.hpp"
 

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

@@ -25,7 +25,7 @@
 #ifndef SHARE_VM_GC_G1_G1OLDGENALLOCATIONTRACKER_HPP
 #define SHARE_VM_GC_G1_G1OLDGENALLOCATIONTRACKER_HPP
 
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "memory/allocation.hpp"
 
 class G1AdaptiveIHOPControl;

src/hotspot/share/gc/g1/g1OopClosures.inline.hpp

@@ -29,10 +29,10 @@
 
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentMark.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1ParScanThreadState.inline.hpp"
 #include "gc/g1/g1RemSet.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/iterator.inline.hpp"

src/hotspot/share/gc/g1/g1Policy.cpp

@@ -34,13 +34,13 @@
 #include "gc/g1/g1ConcurrentRefine.hpp"
 #include "gc/g1/g1ConcurrentRefineStats.hpp"
 #include "gc/g1/g1CollectionSetChooser.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1IHOPControl.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1SurvivorRegions.hpp"
 #include "gc/g1/g1YoungGenSizer.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
 #include "gc/shared/concurrentGCBreakpoints.hpp"
 #include "gc/shared/gcPolicyCounters.hpp"
 #include "logging/log.hpp"

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

@@ -25,7 +25,7 @@
 #ifndef SHARE_GC_G1_G1REGIONPINCACHE_HPP
 #define SHARE_GC_G1_G1REGIONPINCACHE_HPP
 
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
 

src/hotspot/share/gc/g1/g1RegionsOnNodes.cpp

@@ -23,9 +23,9 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1NUMA.hpp"
 #include "gc/g1/g1RegionsOnNodes.hpp"
-#include "gc/g1/heapRegion.hpp"
 
 G1RegionsOnNodes::G1RegionsOnNodes() : _count_per_node(nullptr), _numa(G1NUMA::numa()) {
   _count_per_node = NEW_C_HEAP_ARRAY(uint, _numa->num_active_nodes(), mtGC);

src/hotspot/share/gc/g1/g1RemSet.cpp

@@ -35,14 +35,14 @@
 #include "gc/g1/g1FromCardCache.hpp"
 #include "gc/g1/g1GCParPhaseTimesTracker.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionManager.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1OopClosures.inline.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RootClosures.hpp"
 #include "gc/g1/g1RemSet.hpp"
 #include "gc/g1/g1_globals.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/g1/heapRegionManager.inline.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
 #include "gc/shared/bufferNode.hpp"
 #include "gc/shared/bufferNodeList.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"

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

@@ -26,10 +26,10 @@
 #define SHARE_GC_G1_G1REMSET_HPP
 
 #include "gc/g1/g1CardTable.hpp"
-#include "gc/g1/g1OopClosures.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
+#include "gc/g1/g1OopClosures.hpp"
 #include "gc/g1/g1RemSetSummary.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "memory/allocation.hpp"
 #include "memory/iterator.hpp"
 #include "utilities/ticks.hpp"

src/hotspot/share/gc/g1/g1RemSetSummary.cpp

@@ -29,10 +29,10 @@
 #include "gc/g1/g1ConcurrentRefine.hpp"
 #include "gc/g1/g1ConcurrentRefineThread.hpp"
 #include "gc/g1/g1DirtyCardQueue.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1RemSet.hpp"
 #include "gc/g1/g1RemSetSummary.hpp"
-#include "gc/g1/heapRegion.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/iterator.hpp"
 #include "runtime/javaThread.hpp"

src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.cpp

@@ -24,9 +24,9 @@
 
 #include "precompiled.hpp"
 #include "gc/g1/g1CollectionSetChooser.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1RemSetTrackingPolicy.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
 #include "runtime/safepoint.hpp"
 
 bool G1RemSetTrackingPolicy::needs_scan_for_rebuild(HeapRegion* r) const {

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

@@ -25,8 +25,8 @@
 #ifndef SHARE_GC_G1_G1REMSETTRACKINGPOLICY_HPP
 #define SHARE_GC_G1_G1REMSETTRACKINGPOLICY_HPP
 
-#include "gc/g1/heapRegion.hpp"
-#include "gc/g1/heapRegionType.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
+#include "gc/g1/g1HeapRegionType.hpp"
 #include "memory/allocation.hpp"
 
 // The remembered set tracking policy determines for a given region the state of

src/hotspot/share/gc/g1/g1RootProcessor.cpp

@@ -32,11 +32,11 @@
 #include "gc/g1/g1CollectorState.hpp"
 #include "gc/g1/g1GCParPhaseTimesTracker.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/g1/g1ParScanThreadState.inline.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RootClosures.hpp"
 #include "gc/g1/g1RootProcessor.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
 #include "gc/shared/oopStorage.inline.hpp"
 #include "gc/shared/oopStorageSet.hpp"
 #include "gc/shared/oopStorageSetParState.inline.hpp"

src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp

@@ -25,9 +25,9 @@
 #include "precompiled.hpp"
 #include "gc/g1/g1BarrierSet.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1SATBMarkQueueSet.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "gc/shared/satbMarkQueue.hpp"
 #include "oops/oop.hpp"
 #include "utilities/debug.hpp"

src/hotspot/share/gc/g1/g1SurvRateGroup.cpp

@@ -24,9 +24,9 @@
 
 #include "precompiled.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1Predictions.hpp"
 #include "gc/g1/g1SurvRateGroup.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
 

src/hotspot/share/gc/g1/g1SurvivorRegions.cpp

@@ -23,8 +23,8 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1SurvivorRegions.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/debug.hpp"
 

src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp

@@ -34,12 +34,12 @@
 #include "gc/g1/g1EvacFailureRegions.inline.hpp"
 #include "gc/g1/g1EvacInfo.hpp"
 #include "gc/g1/g1EvacStats.inline.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1OopClosures.inline.hpp"
 #include "gc/g1/g1ParScanThreadState.hpp"
 #include "gc/g1/g1RemSet.hpp"
 #include "gc/g1/g1YoungGCPostEvacuateTasks.hpp"
-#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
 #include "gc/shared/bufferNode.hpp"
 #include "gc/shared/preservedMarks.inline.hpp"
 #include "jfr/jfrEvents.hpp"

src/hotspot/share/gc/g1/g1YoungGenSizer.cpp

@@ -24,8 +24,8 @@
 
 #include "precompiled.hpp"
 #include "gc/g1/g1Arguments.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1YoungGenSizer.hpp"
-#include "gc/g1/heapRegion.hpp"
 #include "logging/log.hpp"
 #include "runtime/globals_extension.hpp"
 

src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/g1/heapRegionBounds.inline.hpp"
+#include "gc/g1/g1HeapRegionBounds.inline.hpp"
 #include "gc/g1/jvmFlagConstraintsG1.hpp"
 #include "gc/shared/bufferNode.hpp"
 #include "gc/shared/ptrQueue.hpp"

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

@@ -26,8 +26,8 @@
 #define SHARE_GC_G1_VMSTRUCTS_G1_HPP
 
 #include "gc/g1/g1CollectedHeap.hpp"
-#include "gc/g1/heapRegion.hpp"
-#include "gc/g1/heapRegionManager.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
+#include "gc/g1/g1HeapRegionManager.hpp"
 #include "utilities/macros.hpp"
 
 #define VM_STRUCTS_G1GC(nonstatic_field,                                      \

src/hotspot/share/jvmci/vmStructs_jvmci.cpp

@@ -43,7 +43,7 @@
 #include "runtime/vm_version.hpp"
 #if INCLUDE_G1GC
 #include "gc/g1/g1CardTable.hpp"
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #endif
 

src/hotspot/share/opto/runtime.cpp

@@ -34,7 +34,7 @@
 #include "code/vtableStubs.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/oopMap.hpp"
-#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/gcLocker.hpp"

src/hotspot/share/prims/whitebox.cpp

@@ -106,8 +106,8 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentMark.hpp"
 #include "gc/g1/g1ConcurrentMarkThread.inline.hpp"
-#include "gc/g1/heapRegionManager.hpp"
-#include "gc/g1/heapRegionRemSet.inline.hpp"
+#include "gc/g1/g1HeapRegionManager.hpp"
+#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #endif // INCLUDE_G1GC
 #if INCLUDE_PARALLELGC
 #include "gc/parallel/parallelScavengeHeap.inline.hpp"