--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp Fri Mar 29 14:17:09 2019 -0400
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp Thu Mar 28 13:53:41 2019 -0400
@@ -130,12 +130,11 @@
void ShenandoahRootProcessor::process_strong_roots(OopClosure* oops,
CLDClosure* clds,
- CLDClosure* weak_clds,
CodeBlobClosure* blobs,
ThreadClosure* thread_cl,
uint worker_id) {
- process_java_roots(oops, clds, weak_clds, blobs, thread_cl, worker_id);
+ process_java_roots(oops, clds, NULL, blobs, thread_cl, worker_id);
process_vm_roots(oops, worker_id);
_process_strong_tasks->all_tasks_completed(n_workers());
@@ -160,39 +159,6 @@
}
-void ShenandoahRootProcessor::update_all_roots(OopClosure* oops,
- CLDClosure* clds,
- CodeBlobClosure* blobs,
- ThreadClosure* thread_cl,
- uint worker_id) {
- process_all_roots(oops, clds, blobs, thread_cl, worker_id);
-
- AlwaysTrueClosure always_true;
- _weak_processor_task.work<AlwaysTrueClosure, OopClosure>(worker_id, &always_true, oops);
- _processed_weak_roots = true;
-
- if (ShenandoahStringDedup::is_enabled()) {
- ShenandoahStringDedup::parallel_oops_do(&always_true, oops, worker_id);
- }
-}
-
-void ShenandoahRootProcessor::traversal_update_all_roots(OopClosure* oops,
- CLDClosure* clds,
- CodeBlobClosure* blobs,
- ThreadClosure* thread_cl,
- uint worker_id) {
- process_all_roots(oops, clds, blobs, thread_cl, worker_id);
-
- ShenandoahIsAliveSelector is_alive;
- BoolObjectClosure* is_alive_closure = is_alive.is_alive_closure();
- _weak_processor_task.work<BoolObjectClosure, OopClosure>(worker_id, is_alive_closure, oops);
- _processed_weak_roots = true;
-
- if (ShenandoahStringDedup::is_enabled()) {
- ShenandoahStringDedup::parallel_oops_do(is_alive_closure, oops, worker_id);
- }
-}
-
class ShenandoahParallelOopsDoThreadClosure : public ThreadClosure {
private:
OopClosure* _f;