--- a/src/hotspot/share/utilities/vmError.cpp	Tue Jun 26 14:14:29 2018 -0300
+++ b/src/hotspot/share/utilities/vmError.cpp	Tue Jun 26 14:15:49 2018 -0400
@@ -1703,7 +1703,7 @@
   // from racing with Threads::add() or Threads::remove() as we
   // generate the hs_err_pid file. This makes our ErrorHandling tests
   // more stable.
-  MutexLockerEx ml(Threads_lock, Mutex::_no_safepoint_check_flag);
+  MutexLockerEx ml(Threads_lock->owned_by_self() ? NULL : Threads_lock, Mutex::_no_safepoint_check_flag);
 
   switch (how) {
     case  1: vmassert(str == NULL, "expected null"); break;