--- a/src/hotspot/share/runtime/thread.cpp	Tue Jun 19 09:43:53 2018 +0200
+++ b/src/hotspot/share/runtime/thread.cpp	Tue Jun 19 10:57:13 2018 +0200
@@ -4219,6 +4219,9 @@
   before_exit(thread);
 
   thread->exit(true);
+  // thread will never call smr_delete, instead of implicit cancel
+  // in wait_for_vm_thread_exit we do it explicit.
+  thread->cancel_handshake();
 
   // Stop VM thread.
   {