src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp

*** 83,92 ****
--- 83,95 ----
  #include "runtime/vmThread.hpp"
  #include "services/memoryService.hpp"
  #include "services/runtimeService.hpp"
  #include "utilities/align.hpp"
  #include "utilities/stack.inline.hpp"
+ #if INCLUDE_JVMCI
+ #include "jvmci/jvmci.hpp"
+ #endif
  
  // statics
  CMSCollector* ConcurrentMarkSweepGeneration::_collector = NULL;
  bool CMSCollector::_full_gc_requested = false;
  GCCause::Cause CMSCollector::_full_gc_cause = GCCause::_no_gc;
*** 5262,5271 ****
--- 5265,5279 ----
        // 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
      }
    }
  
    // Restore any preserved marks as a result of mark stack or
    // work queue overflow