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

*** 68,77 ****
--- 68,78 ----
  #include "gc/shared/generationSpec.hpp"
  #include "gc/shared/isGCActiveMark.hpp"
  #include "gc/shared/preservedMarks.inline.hpp"
  #include "gc/shared/referenceProcessor.inline.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
+ #include "gc/shared/weakProcessor.hpp"
  #include "logging/log.hpp"
  #include "memory/allocation.hpp"
  #include "memory/iterator.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/oop.inline.hpp"
*** 4366,4383 ****
    if (g1_policy()->should_process_references()) {
      preserve_cm_referents(per_thread_states);
      process_discovered_references(per_thread_states);
    } else {
      ref_processor_stw()->verify_no_references_recorded();
!     process_weak_jni_handles();
    }
  
    if (G1StringDedup::is_enabled()) {
      double fixup_start = os::elapsedTime();
  
-     G1STWIsAliveClosure is_alive(this);
-     G1KeepAliveClosure keep_alive(this);
      G1StringDedup::unlink_or_oops_do(&is_alive, &keep_alive, true, g1_policy()->phase_times());
  
      double fixup_time_ms = (os::elapsedTime() - fixup_start) * 1000.0;
      g1_policy()->phase_times()->record_string_dedup_fixup_time(fixup_time_ms);
    }
--- 4367,4393 ----
    if (g1_policy()->should_process_references()) {
      preserve_cm_referents(per_thread_states);
      process_discovered_references(per_thread_states);
    } else {
      ref_processor_stw()->verify_no_references_recorded();
!   }
! 
!   G1STWIsAliveClosure is_alive(this);
!   G1KeepAliveClosure keep_alive(this);
! 
!   {
!     double start = os::elapsedTime();
! 
!     WeakProcessor::unlink_or_oops_do(&is_alive, &keep_alive);
! 
!     double time_ms = (os::elapsedTime() - start) * 1000.0;
!     g1_policy()->phase_times()->record_ref_proc_time(time_ms);
    }
  
    if (G1StringDedup::is_enabled()) {
      double fixup_start = os::elapsedTime();
  
      G1StringDedup::unlink_or_oops_do(&is_alive, &keep_alive, true, g1_policy()->phase_times());
  
      double fixup_time_ms = (os::elapsedTime() - fixup_start) * 1000.0;
      g1_policy()->phase_times()->record_string_dedup_fixup_time(fixup_time_ms);
    }