src/hotspot/share/gc/cms/parNewGeneration.cpp

rev 49831 : imported patch 8201492-properly-implement-non-contiguous-reference-processing
rev 49834 : [mq]: 8202021-cleanup-referenceprocessor

*** 981,991 ****
      &scan_without_gc_barrier, &scan_with_gc_barrier);
    rp->setup_policy(clear_all_soft_refs);
    // Can  the mt_degree be set later (at run_task() time would be best)?
    rp->set_active_mt_degree(active_workers);
    ReferenceProcessorStats stats;
!   ReferenceProcessorPhaseTimes pt(_gc_timer, rp->num_q());
    if (rp->processing_is_mt()) {
      ParNewRefProcTaskExecutor task_executor(*this, *_old_gen, thread_state_set);
      stats = rp->process_discovered_references(&is_alive, &keep_alive,
                                                &evacuate_followers, &task_executor,
                                                &pt);
--- 981,991 ----
      &scan_without_gc_barrier, &scan_with_gc_barrier);
    rp->setup_policy(clear_all_soft_refs);
    // Can  the mt_degree be set later (at run_task() time would be best)?
    rp->set_active_mt_degree(active_workers);
    ReferenceProcessorStats stats;
!   ReferenceProcessorPhaseTimes pt(_gc_timer, rp->num_queues());
    if (rp->processing_is_mt()) {
      ParNewRefProcTaskExecutor task_executor(*this, *_old_gen, thread_state_set);
      stats = rp->process_discovered_references(&is_alive, &keep_alive,
                                                &evacuate_followers, &task_executor,
                                                &pt);