Skip to content

Commit 31918c5

Browse files
committed
8255847: Shenandoah: Shenandoah should not mark through weak roots
Reviewed-by: rkennke
1 parent 867a484 commit 31918c5

File tree

3 files changed

+0
-11
lines changed

3 files changed

+0
-11
lines changed

src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ class ShenandoahConcurrentRootScanner {
200200
ShenandoahVMRoots<CONCURRENT> _vm_roots;
201201
ShenandoahClassLoaderDataRoots<CONCURRENT, false /* single-threaded*/>
202202
_cld_roots;
203-
ShenandoahConcurrentStringDedupRoots _dedup_roots;
204203
ShenandoahNMethodTableSnapshot* _codecache_snapshot;
205204
ShenandoahPhaseTimings::Phase _phase;
206205

src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ ShenandoahConcurrentRootScanner<CONCURRENT>::ShenandoahConcurrentRootScanner(uin
149149
ShenandoahPhaseTimings::Phase phase) :
150150
_vm_roots(phase),
151151
_cld_roots(phase, n_workers),
152-
_dedup_roots(phase),
153152
_codecache_snapshot(NULL),
154153
_phase(phase) {
155154
if (!ShenandoahHeap::heap()->unload_classes()) {
@@ -180,9 +179,7 @@ void ShenandoahConcurrentRootScanner<CONCURRENT>::oops_do(OopClosure* oops, uint
180179
_vm_roots.oops_do(oops, worker_id);
181180

182181
if (!heap->unload_classes()) {
183-
AlwaysTrueClosure always_true;
184182
_cld_roots.cld_do(&clds_cl, worker_id);
185-
_dedup_roots.oops_do(&always_true, oops, worker_id);
186183
ShenandoahWorkerTimingsTracker timer(_phase, ShenandoahPhaseTimings::CodeCacheRoots, worker_id);
187184
CodeBlobToOopClosure blobs(oops, !CodeBlobToOopClosure::FixRelocations);
188185
_codecache_snapshot->parallel_blobs_do(&blobs);

src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,6 @@ void ShenandoahRootVerifier::roots_do(OopClosure* oops) {
136136
JNIHandles::oops_do(oops);
137137
Universe::vm_global()->oops_do(oops);
138138

139-
AlwaysTrueClosure always_true;
140-
WeakProcessor::weak_oops_do(&always_true, oops);
141-
142-
if (ShenandoahStringDedup::is_enabled()) {
143-
ShenandoahStringDedup::oops_do_slow(oops);
144-
}
145-
146139
// Do thread roots the last. This allows verification code to find
147140
// any broken objects from those special roots first, not the accidental
148141
// dangling reference from the thread root.

0 commit comments

Comments
 (0)