--- old/src/hotspot/share/runtime/mutexLocker.cpp	2020-01-15 09:48:15.964786000 +0100
+++ new/src/hotspot/share/runtime/mutexLocker.cpp	2020-01-15 09:48:14.920706000 +0100
@@ -147,6 +147,7 @@
 Monitor* CodeHeapStateAnalytics_lock  = NULL;
 
 Mutex*   MetaspaceExpand_lock         = NULL;
+Mutex*   ThreadIdTableCreate_lock     = NULL;
 
 #define MAX_NUM_MUTEX 128
 static Monitor * _mutex_array[MAX_NUM_MUTEX];
@@ -319,6 +320,7 @@
 #endif
 
   def(CodeHeapStateAnalytics_lock  , PaddedMutex  , leaf,        true,  Monitor::_safepoint_check_never);
+  def(ThreadIdTableCreate_lock     , PaddedMutex  , leaf,        false, Monitor::_safepoint_check_always);
 }
 
 GCMutexLocker::GCMutexLocker(Monitor * mutex) {