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

*** 185,195 ****
      }
  
      // Let the size policy know we're starting
      size_policy->major_collection_begin();
  
-     CodeCache::gc_prologue();
      BiasedLocking::preserve_marks();
  
      // Capture metadata size before collection for sizing.
      size_t metadata_prev_used = MetaspaceUtils::used_bytes();
  
--- 185,194 ----
*** 253,263 ****
      // Delete metaspaces for unloaded class loaders and clean up loader_data graph
      ClassLoaderDataGraph::purge();
      MetaspaceUtils::verify_metrics();
  
      BiasedLocking::restore_marks();
!     CodeCache::gc_epilogue();
      JvmtiExport::gc_epilogue();
  
  #if COMPILER2_OR_JVMCI
      DerivedPointerTable::update_pointers();
  #endif
--- 252,262 ----
      // Delete metaspaces for unloaded class loaders and clean up loader_data graph
      ClassLoaderDataGraph::purge();
      MetaspaceUtils::verify_metrics();
  
      BiasedLocking::restore_marks();
!     heap->prune_nmethods();
      JvmtiExport::gc_epilogue();
  
  #if COMPILER2_OR_JVMCI
      DerivedPointerTable::update_pointers();
  #endif
*** 523,533 ****
      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());
    }
  
    // Flush marking stack.
    follow_stack();
--- 522,532 ----
      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.
!     //ScavengableNMethods::scavengable_nmethods_do(CodeBlobToOopClosure(mark_and_push_closure()));
      AOTLoader::oops_do(mark_and_push_closure());
    }
  
    // Flush marking stack.
    follow_stack();