OpenJDK / amber / amber
changeset 58098:a8f06f2b84b0
8231251: ZGC: Fix ZHeap includes
Reviewed-by: stefank, eosterlund
| author | pliden |
|---|---|
| date | Tue, 24 Sep 2019 17:08:18 +0200 |
| parents | a013100f7a35 |
| children | f2bd6a3993a7 |
| files | src/hotspot/share/gc/z/zHeap.cpp src/hotspot/share/gc/z/zHeap.hpp src/hotspot/share/gc/z/zHeap.inline.hpp |
| diffstat | 3 files changed, 3 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/gc/z/zHeap.cpp Tue Sep 24 10:12:56 2019 -0400 +++ b/src/hotspot/share/gc/z/zHeap.cpp Tue Sep 24 17:08:18 2019 +0200 @@ -22,35 +22,25 @@ */ #include "precompiled.hpp" -#include "gc/shared/gcArguments.hpp" -#include "gc/shared/oopStorage.hpp" -#include "gc/z/zAddress.hpp" +#include "gc/z/zAddress.inline.hpp" #include "gc/z/zGlobals.hpp" #include "gc/z/zHeap.inline.hpp" #include "gc/z/zHeapIterator.hpp" -#include "gc/z/zList.inline.hpp" -#include "gc/z/zLock.inline.hpp" #include "gc/z/zMark.inline.hpp" -#include "gc/z/zOopClosures.inline.hpp" #include "gc/z/zPage.inline.hpp" #include "gc/z/zPageTable.inline.hpp" #include "gc/z/zRelocationSet.inline.hpp" +#include "gc/z/zRelocationSetSelector.hpp" #include "gc/z/zResurrection.hpp" -#include "gc/z/zRootsIterator.hpp" #include "gc/z/zStat.hpp" -#include "gc/z/zTask.hpp" #include "gc/z/zThread.hpp" -#include "gc/z/zTracer.inline.hpp" #include "gc/z/zVerify.hpp" -#include "gc/z/zVirtualMemory.inline.hpp" #include "gc/z/zWorkers.inline.hpp" #include "logging/log.hpp" +#include "memory/iterator.hpp" #include "memory/resourceArea.hpp" -#include "oops/oop.inline.hpp" -#include "runtime/arguments.hpp" #include "runtime/safepoint.hpp" #include "runtime/thread.hpp" -#include "utilities/align.hpp" #include "utilities/debug.hpp" static const ZStatSampler ZSamplerHeapUsedBeforeMark("Memory", "Heap Used Before Mark", ZStatUnitBytes);
--- a/src/hotspot/share/gc/z/zHeap.hpp Tue Sep 24 10:12:56 2019 -0400 +++ b/src/hotspot/share/gc/z/zHeap.hpp Tue Sep 24 17:08:18 2019 +0200 @@ -24,12 +24,8 @@ #ifndef SHARE_GC_Z_ZHEAP_HPP #define SHARE_GC_Z_ZHEAP_HPP -#include "gc/shared/gcTimer.hpp" #include "gc/z/zAllocationFlags.hpp" -#include "gc/z/zArray.hpp" #include "gc/z/zForwardingTable.hpp" -#include "gc/z/zList.hpp" -#include "gc/z/zLock.hpp" #include "gc/z/zMark.hpp" #include "gc/z/zObjectAllocator.hpp" #include "gc/z/zPage.hpp" @@ -38,13 +34,10 @@ #include "gc/z/zReferenceProcessor.hpp" #include "gc/z/zRelocate.hpp" #include "gc/z/zRelocationSet.hpp" -#include "gc/z/zRelocationSetSelector.hpp" -#include "gc/z/zRootsIterator.hpp" #include "gc/z/zWeakRootsProcessor.hpp" #include "gc/z/zServiceability.hpp" #include "gc/z/zUnload.hpp" #include "gc/z/zWorkers.hpp" -#include "memory/allocation.hpp" class ZHeap { friend class VMStructs;
--- a/src/hotspot/share/gc/z/zHeap.inline.hpp Tue Sep 24 10:12:56 2019 -0400 +++ b/src/hotspot/share/gc/z/zHeap.inline.hpp Tue Sep 24 17:08:18 2019 +0200 @@ -33,7 +33,6 @@ #include "gc/z/zOop.inline.hpp" #include "gc/z/zPage.inline.hpp" #include "gc/z/zPageTable.inline.hpp" -#include "gc/z/zUtils.inline.hpp" #include "utilities/debug.hpp" inline ZHeap* ZHeap::heap() {