--- old/src/hotspot/share/runtime/mutexLocker.cpp	2020-04-03 07:05:12.240983456 +0000
+++ new/src/hotspot/share/runtime/mutexLocker.cpp	2020-04-03 07:05:11.360962322 +0000
@@ -188,7 +188,7 @@
 }
 
 void assert_locked_or_safepoint_or_handshake(const Mutex* lock, const JavaThread* thread) {
-  if (Thread::current()->is_VM_thread() && thread->is_vmthread_processing_handshake()) return;
+  if (Thread::current() == thread->active_handshaker()) return;
   assert_locked_or_safepoint(lock);
 }
 #endif