Automatic merge of jdk:master into master

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

@@ -2247,7 +2247,6 @@ void ShenandoahHeap::stw_process_weak_roots(bool full_gc) {
     ShenandoahParallelWeakRootsCleaningTask<ShenandoahForwardedIsAliveClosure, ShenandoahUpdateRefsClosure>
       cleaning_task(timing_phase, &is_alive, &keep_alive, num_workers, !ShenandoahConcurrentRoots::should_do_concurrent_class_unloading());
     _workers->run_task(&cleaning_task);
-    cleaning_task.report_num_dead();
   } else {
     ShenandoahIsAliveClosure is_alive;
 #ifdef ASSERT
@@ -2259,7 +2258,6 @@ void ShenandoahHeap::stw_process_weak_roots(bool full_gc) {
       cleaning_task(timing_phase, &is_alive, &do_nothing_cl, num_workers, !ShenandoahConcurrentRoots::should_do_concurrent_class_unloading());
 #endif
     _workers->run_task(&cleaning_task);
-    cleaning_task.report_num_dead();
   }
 }
 

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

@@ -52,7 +52,6 @@ class ShenandoahParallelWeakRootsCleaningTask : public AbstractGangTask {
   ~ShenandoahParallelWeakRootsCleaningTask();
 
   void work(uint worker_id);
-  void report_num_dead();
 };
 
 // Perform class unloading at a pause

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

@@ -53,6 +53,7 @@ ShenandoahParallelWeakRootsCleaningTask<IsAlive, KeepAlive>::~ShenandoahParallel
   if (StringDedup::is_enabled()) {
     StringDedup::gc_epilogue();
   }
+  _weak_processing_task.report_num_dead();
 }
 
 template<typename IsAlive, typename KeepAlive>
@@ -68,9 +69,4 @@ void ShenandoahParallelWeakRootsCleaningTask<IsAlive, KeepAlive>::work(uint work
   }
 }
 
-template<typename IsAlive, typename KeepAlive>
-void ShenandoahParallelWeakRootsCleaningTask<IsAlive, KeepAlive>::report_num_dead() {
-  _weak_processing_task.report_num_dead();
-}
-
 #endif // SHARE_GC_SHENANDOAH_SHENANDOAHPARALLELCLEANING_INLINE_HPP