src/hotspot/share/gc/g1/g1ConcurrentMark.cpp

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

*** 1654,1664 ****
      // the number of threads involved during discovery could differ from
      // the number of active workers.  This is OK as long as the discovered
      // Reference lists are balanced (see balance_all_queues() and balance_queues()).
      rp->set_active_mt_degree(active_workers);
  
!     ReferenceProcessorPhaseTimes pt(_gc_timer_cm, rp->num_q());
  
      // Process the weak references.
      const ReferenceProcessorStats& stats =
          rp->process_discovered_references(&g1_is_alive,
                                            &g1_keep_alive,
--- 1654,1664 ----
      // the number of threads involved during discovery could differ from
      // the number of active workers.  This is OK as long as the discovered
      // Reference lists are balanced (see balance_all_queues() and balance_queues()).
      rp->set_active_mt_degree(active_workers);
  
!     ReferenceProcessorPhaseTimes pt(_gc_timer_cm, rp->num_queues());
  
      // Process the weak references.
      const ReferenceProcessorStats& stats =
          rp->process_discovered_references(&g1_is_alive,
                                            &g1_keep_alive,
*** 1673,1683 ****
      // global marking stack.
  
      assert(has_overflown() || _global_mark_stack.is_empty(),
             "Mark stack should be empty (unless it has overflown)");
  
!     assert(rp->num_q() == active_workers, "why not");
  
      rp->enqueue_discovered_references(executor, &pt);
  
      rp->verify_no_references_recorded();
  
--- 1673,1683 ----
      // global marking stack.
  
      assert(has_overflown() || _global_mark_stack.is_empty(),
             "Mark stack should be empty (unless it has overflown)");
  
!     assert(rp->num_queues() == active_workers, "why not");
  
      rp->enqueue_discovered_references(executor, &pt);
  
      rp->verify_no_references_recorded();