--- old/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp 2020-02-28 10:45:00.603997283 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp 2020-02-28 10:45:00.307997463 +0100 @@ -404,7 +404,6 @@ task_queues()->reserve(nworkers); { - ShenandoahTerminationTracker term(ShenandoahPhaseTimings::conc_termination); TaskTerminator terminator(nworkers, task_queues()); ShenandoahConcurrentMarkingTask task(this, &terminator); workers->run_task(&task); @@ -435,10 +434,6 @@ ShenandoahIsAliveSelector is_alive; ReferenceProcessorIsAliveMutator fix_isalive(_heap->ref_processor(), is_alive.is_alive_closure()); - ShenandoahTerminationTracker termination_tracker(full_gc ? - ShenandoahPhaseTimings::full_gc_mark_termination : - ShenandoahPhaseTimings::termination); - StrongRootsScope scope(nworkers); TaskTerminator terminator(nworkers, task_queues()); ShenandoahFinalMarkingTask task(this, &terminator, ShenandoahStringDedup::is_enabled()); @@ -636,11 +631,6 @@ ShenandoahPhaseTimings::full_gc_weakrefs_process : ShenandoahPhaseTimings::weakrefs_process; - ShenandoahPhaseTimings::Phase phase_process_termination = - full_gc ? - ShenandoahPhaseTimings::full_gc_weakrefs_termination : - ShenandoahPhaseTimings::weakrefs_termination; - shenandoah_assert_rp_isalive_not_installed(); ShenandoahIsAliveSelector is_alive; ReferenceProcessorIsAliveMutator fix_isalive(rp, is_alive.is_alive_closure()); @@ -667,7 +657,6 @@ { ShenandoahGCPhase phase(phase_process); - ShenandoahTerminationTracker phase_term(phase_process_termination); if (_heap->has_forwarded_objects()) { ShenandoahCMKeepAliveUpdateClosure keep_alive(get_queue(serial_worker_id)); @@ -942,7 +931,6 @@ // No work encountered in current stride, try to terminate. // Need to leave the STS here otherwise it might block safepoints. ShenandoahSuspendibleThreadSetLeaver stsl(CANCELLABLE && ShenandoahSuspendibleWorkers); - ShenandoahTerminationTimingsTracker term_tracker(worker_id); ShenandoahTerminatorTerminator tt(heap); if (terminator->offer_termination(&tt)) return; }