--- old/src/hotspot/share/gc/parallel/psParallelCompact.cpp	2019-03-28 11:22:36.000000000 -0700
+++ new/src/hotspot/share/gc/parallel/psParallelCompact.cpp	2019-03-28 11:22:36.000000000 -0700
@@ -54,6 +54,9 @@
 #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 "memory/iterator.inline.hpp"
 #include "memory/resourceArea.hpp"
@@ -2176,6 +2179,11 @@
 
     // 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());