OpenJDK / jdk / jdk
changeset 59976:e9398bf87ad1
8248227: Shenandoah: Refactor Shenandoah::heap() to match other GCs
Reviewed-by: shade
| author | zgu |
|---|---|
| date | Mon, 29 Jun 2020 10:14:18 -0400 |
| parents | 01e29f94df3b |
| children | e16f16838730 |
| files | src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp |
| diffstat | 3 files changed, 1 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Mon Jun 29 14:49:03 2020 +0100 +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Mon Jun 29 10:14:18 2020 -0400 @@ -83,8 +83,6 @@ #include "services/mallocTracker.hpp" #include "utilities/powerOfTwo.hpp" -ShenandoahHeap* ShenandoahHeap::_heap = NULL; - #ifdef ASSERT template <class T> void ShenandoahAssertToSpaceClosure::do_oop_work(T* p) { @@ -497,8 +495,6 @@ _liveness_cache(NULL), _collection_set(NULL) { - _heap = this; - BarrierSet::set_barrier_set(new ShenandoahBarrierSet(this)); _max_workers = MAX2(_max_workers, 1U);
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp Mon Jun 29 14:49:03 2020 +0100 +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp Mon Jun 29 10:14:18 2020 -0400 @@ -141,9 +141,6 @@ // ---------- Initialization, termination, identification, printing routines // -private: - static ShenandoahHeap* _heap; - public: static ShenandoahHeap* heap();
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp Mon Jun 29 14:49:03 2020 +0100 +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp Mon Jun 29 10:14:18 2020 -0400 @@ -49,8 +49,7 @@ #include "utilities/globalDefinitions.hpp" inline ShenandoahHeap* ShenandoahHeap::heap() { - assert(_heap != NULL, "Heap is not initialized yet"); - return _heap; + return named_heap<ShenandoahHeap>(CollectedHeap::Shenandoah); } inline ShenandoahHeapRegion* ShenandoahRegionIterator::next() {