src/hotspot/share/gc/parallel/psMarkSweep.cpp

*** 45,54 ****
--- 45,55 ----
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/isGCActiveMark.hpp"
  #include "gc/shared/referencePolicy.hpp"
  #include "gc/shared/referenceProcessor.hpp"
  #include "gc/shared/spaceDecorator.hpp"
+ #include "gc/shared/weakProcessor.hpp"
  #include "logging/log.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/biasedLocking.hpp"
  #include "runtime/safepoint.hpp"
  #include "runtime/vmThread.hpp"
*** 540,549 ****
--- 541,555 ----
          is_alive_closure(), mark_and_push_closure(), follow_stack_closure(), NULL, &pt);
      gc_tracer()->report_gc_reference_stats(stats);
      pt.print_all_references();
    }
  
+   {
+     GCTraceTime(Debug, gc, phases) t("Weak Processing", _gc_timer);
+     WeakProcessor::unlink_or_oops_do(is_alive_closure(), mark_and_push_closure(), follow_stack_closure());
+   }
+ 
    // This is the point where the entire marking should have completed.
    assert(_marking_stack.is_empty(), "Marking should have completed");
  
    {
      GCTraceTime(Debug, gc, phases) t("Class Unloading", _gc_timer);
*** 615,625 ****
    ClassLoaderDataGraph::cld_do(adjust_cld_closure());
  
    // Now adjust pointers in remaining weak roots.  (All of which should
    // have been cleared if they pointed to non-surviving objects.)
    // Global (weak) JNI handles
!   JNIHandles::weak_oops_do(adjust_pointer_closure());
  
    CodeBlobToOopClosure adjust_from_blobs(adjust_pointer_closure(), CodeBlobToOopClosure::FixRelocations);
    CodeCache::blobs_do(&adjust_from_blobs);
    AOTLoader::oops_do(adjust_pointer_closure());
    StringTable::oops_do(adjust_pointer_closure());
--- 621,631 ----
    ClassLoaderDataGraph::cld_do(adjust_cld_closure());
  
    // Now adjust pointers in remaining weak roots.  (All of which should
    // have been cleared if they pointed to non-surviving objects.)
    // Global (weak) JNI handles
!   WeakProcessor::oops_do(adjust_pointer_closure());
  
    CodeBlobToOopClosure adjust_from_blobs(adjust_pointer_closure(), CodeBlobToOopClosure::FixRelocations);
    CodeCache::blobs_do(&adjust_from_blobs);
    AOTLoader::oops_do(adjust_pointer_closure());
    StringTable::oops_do(adjust_pointer_closure());