--- old/src/hotspot/share/runtime/mutexLocker.cpp	2021-04-20 17:54:01.873775649 +0000
+++ new/src/hotspot/share/runtime/mutexLocker.cpp	2021-04-20 17:54:01.717771759 +0000
@@ -329,7 +329,7 @@
   def(UnsafeJlong_lock             , PaddedMutex  , special,     false, Monitor::_safepoint_check_never);
 #endif
 
-  def(CodeHeapStateAnalytics_lock  , PaddedMutex  , leaf,        true,  Monitor::_safepoint_check_never);
+  def(CodeHeapStateAnalytics_lock  , PaddedMutex  , nonleaf+6,   false, Monitor::_safepoint_check_always);
   def(ThreadIdTableCreate_lock     , PaddedMutex  , leaf,        false, Monitor::_safepoint_check_always);
 }