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

rev 49747 : [mq]: 6672778-partial-queue-trimming
rev 49748 : imported patch 6672778-refactoring
rev 49749 : imported patch 6672778-stefanj-review
rev 49750 : imported patch 6672778-inconsistent-time-fixes
rev 49757 : imported patch 8201596-weak-processing-missing
rev 49758 : imported patch 8201492-properly-implement-non-contiguous-reference-processing

*** 111,122 ****
    _gc_par_phases[RedirtyCards]->link_thread_work_items(_redirtied_cards);
  
    _gc_par_phases[YoungFreeCSet] = new WorkerDataArray<double>(max_gc_threads, "Young Free Collection Set (ms):");
    _gc_par_phases[NonYoungFreeCSet] = new WorkerDataArray<double>(max_gc_threads, "Non-Young Free Collection Set (ms):");
  
-   _gc_par_phases[PreserveCMReferents] = new WorkerDataArray<double>(max_gc_threads, "Parallel Preserve CM Refs (ms):");
- 
    reset();
  }
  
  void G1GCPhaseTimes::reset() {
    _cur_collection_par_time_ms = 0.0;
--- 111,120 ----
*** 400,412 ****
  
    info_time("Post Evacuate Collection Set", sum_ms);
  
    debug_time("Code Roots Fixup", _cur_collection_code_root_fixup_time_ms);
  
-   debug_time("Preserve CM Refs", _recorded_preserve_cm_referents_time_ms);
-   trace_phase(_gc_par_phases[PreserveCMReferents]);
- 
    debug_time_for_reference("Reference Processing", _cur_ref_proc_time_ms);
    _ref_phase_times.print_all_references(2, false);
  
    debug_time("Weak Processing", _cur_weak_ref_proc_time_ms);
  
--- 398,407 ----