# HG changeset patch # User stefank # Date 1554136572 -7200 # Node ID baf213e62aeb80214a0f1e8e9b98f55147dcf481 # Parent f60c52198a425a2bf3ca9cb772499c5072f3fa1f 8221558: Remove obsolete uses of OopStorage::ParState<'false, false> _par_state Reviewed-by: pliden, tschatzl diff -r f60c52198a42 -r baf213e62aeb src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp --- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp Mon Apr 01 18:36:01 2019 +0200 +++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp Mon Apr 01 18:36:12 2019 +0200 @@ -24,8 +24,6 @@ #include "precompiled.hpp" #include "classfile/classLoaderDataGraph.hpp" -#include "classfile/stringTable.hpp" -#include "classfile/symbolTable.hpp" #include "classfile/systemDictionary.hpp" #include "code/codeCache.hpp" #include "gc/cms/cmsCollectorPolicy.hpp" @@ -54,7 +52,6 @@ #include "gc/shared/genCollectedHeap.hpp" #include "gc/shared/genOopClosures.inline.hpp" #include "gc/shared/isGCActiveMark.hpp" -#include "gc/shared/oopStorageParState.hpp" #include "gc/shared/owstTaskTerminator.hpp" #include "gc/shared/referencePolicy.hpp" #include "gc/shared/referenceProcessorPhaseTimes.hpp" @@ -2771,12 +2768,10 @@ protected: CMSCollector* _collector; uint _n_workers; - OopStorage::ParState _par_state_string; CMSParMarkTask(const char* name, CMSCollector* collector, uint n_workers) : AbstractGangTask(name), _collector(collector), - _n_workers(n_workers), - _par_state_string(StringTable::weak_storage()) {} + _n_workers(n_workers) {} // Work method in support of parallel rescan ... of young gen spaces void do_young_space_rescan(OopsInGenClosure* cl, ContiguousSpace* space, diff -r f60c52198a42 -r baf213e62aeb src/hotspot/share/gc/cms/parNewGeneration.cpp --- a/src/hotspot/share/gc/cms/parNewGeneration.cpp Mon Apr 01 18:36:01 2019 +0200 +++ b/src/hotspot/share/gc/cms/parNewGeneration.cpp Mon Apr 01 18:36:12 2019 +0200 @@ -582,8 +582,7 @@ _young_gen(young_gen), _old_gen(old_gen), _young_old_boundary(young_old_boundary), _state_set(state_set), - _strong_roots_scope(strong_roots_scope), - _par_state_string(StringTable::weak_storage()) + _strong_roots_scope(strong_roots_scope) {} void ParNewGenTask::work(uint worker_id) { diff -r f60c52198a42 -r baf213e62aeb src/hotspot/share/gc/cms/parNewGeneration.hpp --- a/src/hotspot/share/gc/cms/parNewGeneration.hpp Mon Apr 01 18:36:01 2019 +0200 +++ b/src/hotspot/share/gc/cms/parNewGeneration.hpp Mon Apr 01 18:36:12 2019 +0200 @@ -235,7 +235,6 @@ HeapWord* _young_old_boundary; class ParScanThreadStateSet* _state_set; StrongRootsScope* _strong_roots_scope; - OopStorage::ParState _par_state_string; public: ParNewGenTask(ParNewGeneration* young_gen, diff -r f60c52198a42 -r baf213e62aeb src/hotspot/share/gc/g1/g1RootProcessor.cpp --- a/src/hotspot/share/gc/g1/g1RootProcessor.cpp Mon Apr 01 18:36:01 2019 +0200 +++ b/src/hotspot/share/gc/g1/g1RootProcessor.cpp Mon Apr 01 18:36:12 2019 +0200 @@ -38,7 +38,6 @@ #include "gc/g1/g1RootClosures.hpp" #include "gc/g1/g1RootProcessor.hpp" #include "gc/g1/heapRegion.inline.hpp" -#include "gc/shared/oopStorageParState.hpp" #include "gc/shared/referenceProcessor.hpp" #include "memory/allocation.inline.hpp" #include "runtime/mutex.hpp" @@ -71,7 +70,6 @@ _g1h(g1h), _process_strong_tasks(G1RP_PS_NumElements), _srs(n_workers), - _par_state_string(StringTable::weak_storage()), _lock(Mutex::leaf, "G1 Root Scanning barrier lock", false, Monitor::_safepoint_check_never), _n_workers_discovered_strong_classes(0) {} diff -r f60c52198a42 -r baf213e62aeb src/hotspot/share/gc/g1/g1RootProcessor.hpp --- a/src/hotspot/share/gc/g1/g1RootProcessor.hpp Mon Apr 01 18:36:01 2019 +0200 +++ b/src/hotspot/share/gc/g1/g1RootProcessor.hpp Mon Apr 01 18:36:12 2019 +0200 @@ -25,7 +25,6 @@ #ifndef SHARE_GC_G1_G1ROOTPROCESSOR_HPP #define SHARE_GC_G1_G1ROOTPROCESSOR_HPP -#include "gc/shared/oopStorageParState.hpp" #include "gc/shared/strongRootsScope.hpp" #include "memory/allocation.hpp" #include "runtime/mutex.hpp" @@ -50,7 +49,6 @@ G1CollectedHeap* _g1h; SubTasksDone _process_strong_tasks; StrongRootsScope _srs; - OopStorage::ParState _par_state_string; // Used to implement the Thread work barrier. Monitor _lock;