--- old/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp	2019-03-11 22:56:13.954566987 +0100
+++ new/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp	2019-03-11 22:56:13.410558167 +0100
@@ -4194,9 +4194,6 @@
 
   CMSHeap* heap = CMSHeap::heap();
 
-  if (should_unload_classes()) {
-    CodeCache::gc_prologue();
-  }
   assert(haveFreelistLocks(), "must have free list locks");
   assert_lock_strong(bitMapLock());
 
@@ -4252,7 +4249,7 @@
   verify_overflow_empty();
 
   if (should_unload_classes()) {
-    CodeCache::gc_epilogue();
+    heap->prune_nmethods();
   }
   JvmtiExport::gc_epilogue();