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

*** 521,531 ****
      Threads::oops_do(mark_and_push_closure(), &each_active_code_blob);
      ObjectSynchronizer::oops_do(mark_and_push_closure());
      Management::oops_do(mark_and_push_closure());
      JvmtiExport::oops_do(mark_and_push_closure());
      SystemDictionary::oops_do(mark_and_push_closure());
!     ClassLoaderDataGraph::always_strong_cld_do(follow_cld_closure());
      // Do not treat nmethods as strong roots for mark/sweep, since we can unload them.
      //CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure(mark_and_push_closure()));
      AOTLoader::oops_do(mark_and_push_closure());
    }
  
--- 521,531 ----
      Threads::oops_do(mark_and_push_closure(), &each_active_code_blob);
      ObjectSynchronizer::oops_do(mark_and_push_closure());
      Management::oops_do(mark_and_push_closure());
      JvmtiExport::oops_do(mark_and_push_closure());
      SystemDictionary::oops_do(mark_and_push_closure());
!     ClassLoaderDataGraph::always_strong_cld_oops_do(follow_cld_closure());
      // Do not treat nmethods as strong roots for mark/sweep, since we can unload them.
      //CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure(mark_and_push_closure()));
      AOTLoader::oops_do(mark_and_push_closure());
    }
  
*** 618,628 ****
    Threads::oops_do(adjust_pointer_closure(), NULL);
    ObjectSynchronizer::oops_do(adjust_pointer_closure());
    Management::oops_do(adjust_pointer_closure());
    JvmtiExport::oops_do(adjust_pointer_closure());
    SystemDictionary::oops_do(adjust_pointer_closure());
!   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());
--- 618,628 ----
    Threads::oops_do(adjust_pointer_closure(), NULL);
    ObjectSynchronizer::oops_do(adjust_pointer_closure());
    Management::oops_do(adjust_pointer_closure());
    JvmtiExport::oops_do(adjust_pointer_closure());
    SystemDictionary::oops_do(adjust_pointer_closure());
!   ClassLoaderDataGraph::cld_oops_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());