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

*** 48,57 ****
--- 48,60 ----
  #include "gc/shared/referencePolicy.hpp"
  #include "gc/shared/referenceProcessor.hpp"
  #include "gc/shared/referenceProcessorPhaseTimes.hpp"
  #include "gc/shared/spaceDecorator.hpp"
  #include "gc/shared/weakProcessor.hpp"
+ #if INCLUDE_JVMCI
+ #include "jvmci/jvmci.hpp"
+ #endif
  #include "logging/log.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/biasedLocking.hpp"
  #include "runtime/flags/flagSetting.hpp"
  #include "runtime/handles.inline.hpp"
*** 560,569 ****
--- 563,577 ----
      // Unload nmethods.
      CodeCache::do_unloading(is_alive_closure(), purged_class);
  
      // Prune dead klasses from subklass/sibling/implementor lists.
      Klass::clean_weak_klass_links(purged_class);
+ 
+ #if INCLUDE_JVMCI
+     // Clean JVMCI metadata handles.
+     JVMCI::do_unloading(is_alive_closure(), purged_class);
+ #endif
    }
  
    _gc_tracer->report_object_count_after_gc(is_alive_closure());
  }