# HG changeset patch # User zgu # Date 1547820649 18000 # Node ID 5dc89efc08f059f37d3f7d687501bd7101791b6d # Parent 28b79ca141dfb241fb84168fd16b0c143dae347b 8217319: Cleanup Shenandoah includes Reviewed-by: shade diff -r 28b79ca141df -r 5dc89efc08f0 src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp Fri Jan 18 05:33:28 2019 -0500 +++ b/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp Fri Jan 18 09:10:49 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Red Hat, Inc. All rights reserved. + * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as @@ -25,7 +25,6 @@ #include "gc/shenandoah/shenandoahAsserts.hpp" #include "gc/shenandoah/shenandoahBrooksPointer.hpp" -#include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp" #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp" diff -r 28b79ca141df -r 5dc89efc08f0 src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp Fri Jan 18 05:33:28 2019 -0500 +++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp Fri Jan 18 09:10:49 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved. + * Copyright (c) 2017, 2019, Red Hat, Inc. All rights reserved. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as @@ -24,7 +24,6 @@ #include "precompiled.hpp" #include "code/codeCache.hpp" #include "code/nmethod.hpp" -#include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahCodeRoots.hpp" #include "memory/resourceArea.hpp" diff -r 28b79ca141df -r 5dc89efc08f0 src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp Fri Jan 18 05:33:28 2019 -0500 +++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp Fri Jan 18 09:10:49 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Red Hat, Inc. All rights reserved. + * Copyright (c) 2013, 2019, Red Hat, Inc. All rights reserved. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as @@ -27,7 +27,6 @@ #include "classfile/systemDictionary.hpp" #include "code/codeCache.hpp" -#include "gc/shared/weakProcessor.hpp" #include "gc/shared/weakProcessor.inline.hpp" #include "gc/shared/gcTimer.hpp" #include "gc/shared/referenceProcessor.hpp" @@ -38,9 +37,7 @@ #include "gc/shenandoah/shenandoahMarkCompact.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahRootProcessor.hpp" -#include "gc/shenandoah/shenandoahOopClosures.hpp" #include "gc/shenandoah/shenandoahOopClosures.inline.hpp" -#include "gc/shenandoah/shenandoahTaskqueue.hpp" #include "gc/shenandoah/shenandoahTaskqueue.inline.hpp" #include "gc/shenandoah/shenandoahTimingTracker.hpp" #include "gc/shenandoah/shenandoahUtils.hpp" diff -r 28b79ca141df -r 5dc89efc08f0 src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Fri Jan 18 05:33:28 2019 -0500 +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Fri Jan 18 09:10:49 2019 -0500 @@ -35,7 +35,6 @@ #include "gc/shenandoah/shenandoahBrooksPointer.hpp" #include "gc/shenandoah/shenandoahCollectionSet.hpp" #include "gc/shenandoah/shenandoahCollectorPolicy.hpp" -#include "gc/shenandoah/shenandoahConcurrentMark.hpp" #include "gc/shenandoah/shenandoahConcurrentMark.inline.hpp" #include "gc/shenandoah/shenandoahControlThread.hpp" #include "gc/shenandoah/shenandoahFreeSet.hpp" @@ -49,7 +48,6 @@ #include "gc/shenandoah/shenandoahMetrics.hpp" #include "gc/shenandoah/shenandoahMonitoringSupport.hpp" #include "gc/shenandoah/shenandoahOopClosures.inline.hpp" -#include "gc/shenandoah/shenandoahPacer.hpp" #include "gc/shenandoah/shenandoahPacer.inline.hpp" #include "gc/shenandoah/shenandoahRootProcessor.hpp" #include "gc/shenandoah/shenandoahStringDedup.hpp" diff -r 28b79ca141df -r 5dc89efc08f0 src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp Fri Jan 18 05:33:28 2019 -0500 +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp Fri Jan 18 09:10:49 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Red Hat, Inc. All rights reserved. + * Copyright (c) 2013, 2019, Red Hat, Inc. All rights reserved. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as @@ -25,7 +25,6 @@ #include "memory/allocation.hpp" #include "gc/shenandoah/shenandoahBrooksPointer.hpp" #include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp" -#include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahHeapRegion.hpp" #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp" diff -r 28b79ca141df -r 5dc89efc08f0 src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.cpp Fri Jan 18 05:33:28 2019 -0500 +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.cpp Fri Jan 18 09:10:49 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Red Hat, Inc. All rights reserved. + * Copyright (c) 2013, 2019, Red Hat, Inc. All rights reserved. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as @@ -22,9 +22,7 @@ */ #include "precompiled.hpp" -#include "gc/shenandoah/shenandoahHeapRegionSet.hpp" #include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp" -#include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahHeapRegion.hpp" #include "gc/shenandoah/shenandoahUtils.hpp" diff -r 28b79ca141df -r 5dc89efc08f0 src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp Fri Jan 18 05:33:28 2019 -0500 +++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp Fri Jan 18 09:10:49 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Red Hat, Inc. All rights reserved. + * Copyright (c) 2014, 2019, Red Hat, Inc. All rights reserved. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as @@ -32,13 +32,11 @@ #include "gc/shenandoah/shenandoahPhaseTimings.hpp" #include "gc/shenandoah/shenandoahMarkCompact.hpp" #include "gc/shenandoah/shenandoahHeapRegionSet.hpp" -#include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahHeuristics.hpp" #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp" #include "gc/shenandoah/shenandoahRootProcessor.hpp" #include "gc/shenandoah/shenandoahTraversalGC.hpp" -#include "gc/shenandoah/shenandoahTaskqueue.hpp" #include "gc/shenandoah/shenandoahTaskqueue.inline.hpp" #include "gc/shenandoah/shenandoahUtils.hpp" #include "gc/shenandoah/shenandoahVerifier.hpp" diff -r 28b79ca141df -r 5dc89efc08f0 src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp Fri Jan 18 05:33:28 2019 -0500 +++ b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp Fri Jan 18 09:10:49 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Red Hat, Inc. All rights reserved. + * Copyright (c) 2013, 2019, Red Hat, Inc. All rights reserved. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as @@ -23,7 +23,6 @@ #include "precompiled.hpp" #include "gc/shenandoah/shenandoahMetrics.hpp" -#include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahHeapRegion.hpp" #include "gc/shenandoah/shenandoahFreeSet.hpp" diff -r 28b79ca141df -r 5dc89efc08f0 src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp Fri Jan 18 05:33:28 2019 -0500 +++ b/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp Fri Jan 18 09:10:49 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Red Hat, Inc. All rights reserved. + * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as @@ -24,7 +24,6 @@ #include "precompiled.hpp" #include "gc/shenandoah/shenandoahFreeSet.hpp" -#include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahPacer.hpp" diff -r 28b79ca141df -r 5dc89efc08f0 src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.cpp Fri Jan 18 05:33:28 2019 -0500 +++ b/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.cpp Fri Jan 18 09:10:49 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved. + * Copyright (c) 2017, 2019, Red Hat, Inc. All rights reserved. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as @@ -26,7 +26,6 @@ #include "gc/shared/stringdedup/stringDedup.hpp" #include "gc/shared/stringdedup/stringDedupThread.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" -#include "gc/shenandoah/shenandoahStrDedupQueue.hpp" #include "gc/shenandoah/shenandoahStrDedupQueue.inline.hpp" #include "gc/shenandoah/shenandoahStringDedup.hpp" #include "logging/log.hpp" diff -r 28b79ca141df -r 5dc89efc08f0 src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp Fri Jan 18 05:33:28 2019 -0500 +++ b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp Fri Jan 18 09:10:49 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved. + * Copyright (c) 2017, 2019, Red Hat, Inc. All rights reserved. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as @@ -23,12 +23,9 @@ #include "precompiled.hpp" -#include "gc/shared/stringdedup/stringDedup.hpp" #include "gc/shared/stringdedup/stringDedup.inline.hpp" #include "gc/shared/workgroup.hpp" -#include "gc/shenandoah/shenandoahCollectionSet.hpp" #include "gc/shenandoah/shenandoahCollectionSet.inline.hpp" -#include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp" #include "gc/shenandoah/shenandoahStringDedup.hpp" diff -r 28b79ca141df -r 5dc89efc08f0 src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp Fri Jan 18 05:33:28 2019 -0500 +++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp Fri Jan 18 09:10:49 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Red Hat, Inc. All rights reserved. + * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as @@ -28,7 +28,6 @@ #include "gc/shared/referenceProcessor.hpp" #include "gc/shared/referenceProcessorPhaseTimes.hpp" #include "gc/shared/workgroup.hpp" -#include "gc/shared/weakProcessor.hpp" #include "gc/shared/weakProcessor.inline.hpp" #include "gc/shenandoah/shenandoahBarrierSet.hpp" #include "gc/shenandoah/shenandoahCodeRoots.hpp" @@ -36,16 +35,13 @@ #include "gc/shenandoah/shenandoahCollectorPolicy.hpp" #include "gc/shenandoah/shenandoahFreeSet.hpp" #include "gc/shenandoah/shenandoahPhaseTimings.hpp" -#include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" -#include "gc/shenandoah/shenandoahHeapRegionSet.hpp" #include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp" #include "gc/shenandoah/shenandoahHeuristics.hpp" #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp" #include "gc/shenandoah/shenandoahOopClosures.inline.hpp" #include "gc/shenandoah/shenandoahRootProcessor.hpp" #include "gc/shenandoah/shenandoahStringDedup.hpp" -#include "gc/shenandoah/shenandoahTaskqueue.hpp" #include "gc/shenandoah/shenandoahTaskqueue.inline.hpp" #include "gc/shenandoah/shenandoahTimingTracker.hpp" #include "gc/shenandoah/shenandoahTraversalGC.hpp" diff -r 28b79ca141df -r 5dc89efc08f0 src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp Fri Jan 18 05:33:28 2019 -0500 +++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp Fri Jan 18 09:10:49 2019 -0500 @@ -26,7 +26,6 @@ #include "gc/shenandoah/shenandoahAsserts.hpp" #include "gc/shenandoah/shenandoahBrooksPointer.hpp" #include "gc/shenandoah/shenandoahPhaseTimings.hpp" -#include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahRootProcessor.hpp" #include "gc/shenandoah/shenandoahTaskqueue.inline.hpp"