--- old/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp	2019-03-29 17:26:11.000000000 -0700
+++ new/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp	2019-03-29 17:26:11.000000000 -0700
@@ -5268,10 +5268,8 @@
       // 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
+      JVMCI_ONLY(JVMCI::do_unloading(&_is_alive_closure, purged_class));
     }
   }