--- a/src/hotspot/share/runtime/thread.cpp	Thu Jun 28 21:58:23 2018 -0700
+++ b/src/hotspot/share/runtime/thread.cpp	Fri Jun 29 11:08:38 2018 +0200
@@ -3298,6 +3298,11 @@
 }
 
 CompilerThread::~CompilerThread() {
+  // Free buffer blob, if allocated
+  if (get_buffer_blob() != NULL) {
+    MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+    CodeCache::free(get_buffer_blob());
+  }
   // Delete objects which were allocated on heap.
   delete _counters;
 }