changeset 53544:367ca5f32505

8213829: Remove circular dependency between g1CollectedHeap and g1ConcurrentMark Summary: Improve include statements related to g1CollectedHeap.inline.hpp Reviewed-by: kbarrett, tschatzl
author manc
date Tue, 13 Nov 2018 22:08:44 -0800
parents 1092ba73cb2d
children 5b87d3fc1093
files src/hotspot/share/gc/g1/dirtyCardQueue.cpp src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp src/hotspot/share/gc/g1/g1FullGCReferenceProcessorExecutor.cpp src/hotspot/share/gc/g1/heapRegionManager.cpp
diffstat 4 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/gc/g1/dirtyCardQueue.cpp	Thu Nov 15 13:22:29 2018 -0500
+++ b/src/hotspot/share/gc/g1/dirtyCardQueue.cpp	Tue Nov 13 22:08:44 2018 -0800
@@ -28,6 +28,7 @@
 #include "gc/g1/g1RemSet.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/heapRegionRemSet.hpp"
+#include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/workgroup.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp	Thu Nov 15 13:22:29 2018 -0500
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp	Tue Nov 13 22:08:44 2018 -0800
@@ -28,10 +28,9 @@
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1CollectedHeap.hpp"
 #include "gc/g1/g1CollectorState.hpp"
-#include "gc/g1/g1ConcurrentMark.inline.hpp"
 #include "gc/g1/heapRegionManager.inline.hpp"
 #include "gc/g1/heapRegionSet.inline.hpp"
-#include "gc/shared/taskqueue.hpp"
+#include "gc/shared/taskqueue.inline.hpp"
 #include "runtime/orderAccess.hpp"
 
 G1EvacStats* G1CollectedHeap::alloc_buffer_stats(InCSetState dest) {
--- a/src/hotspot/share/gc/g1/g1FullGCReferenceProcessorExecutor.cpp	Thu Nov 15 13:22:29 2018 -0500
+++ b/src/hotspot/share/gc/g1/g1FullGCReferenceProcessorExecutor.cpp	Tue Nov 13 22:08:44 2018 -0800
@@ -30,6 +30,7 @@
 #include "gc/g1/g1FullGCReferenceProcessorExecutor.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/referenceProcessor.hpp"
+#include "gc/shared/referenceProcessorPhaseTimes.hpp"
 #include "memory/iterator.inline.hpp"
 
 G1FullGCReferenceProcessingExecutor::G1FullGCReferenceProcessingExecutor(G1FullCollector* collector) :
--- a/src/hotspot/share/gc/g1/heapRegionManager.cpp	Thu Nov 15 13:22:29 2018 -0500
+++ b/src/hotspot/share/gc/g1/heapRegionManager.cpp	Tue Nov 13 22:08:44 2018 -0800
@@ -29,6 +29,7 @@
 #include "gc/g1/heapRegionManager.inline.hpp"
 #include "gc/g1/heapRegionSet.inline.hpp"
 #include "memory/allocation.hpp"
+#include "utilities/bitMap.inline.hpp"
 
 class MasterFreeRegionListChecker : public HeapRegionSetChecker {
 public: