diff -r adb107c71a12 -r 2b58b8e1d28f src/hotspot/share/runtime/threadSMR.cpp
--- a/src/hotspot/share/runtime/threadSMR.cpp	Wed Oct 31 09:09:23 2018 +0100
+++ b/src/hotspot/share/runtime/threadSMR.cpp	Wed Oct 31 08:09:45 2018 +0100
@@ -989,11 +989,6 @@
     // Retry the whole scenario.
   }
 
-  if (ThreadLocalHandshakes) {
-    // The thread is about to be deleted so cancel any handshake.
-    thread->cancel_handshake();
-  }
-
   delete thread;
   if (EnableThreadSMRStatistics) {
     timer.stop();