src/hotspot/share/runtime/mutexLocker.cpp

@@ -126,10 +126,14 @@
  Mutex*   JfrBuffer_lock               = NULL;
  Mutex*   JfrStream_lock               = NULL;
  Monitor* JfrThreadSampler_lock        = NULL;
  #endif
  
+ #if INCLUDE_TSAN
+ Mutex*   TsanOopMap_lock              = NULL;
+ #endif
+ 
  #ifndef SUPPORTS_NATIVE_CX8
  Mutex*   UnsafeJlong_lock             = NULL;
  #endif
  Mutex*   CodeHeapStateAnalytics_lock  = NULL;
  

@@ -317,10 +321,14 @@
    def(JfrStream_lock               , PaddedMutex  , nonleaf + 1, false, _safepoint_check_never);
    def(JfrStacktrace_lock           , PaddedMutex  , special,     true,  _safepoint_check_never);
    def(JfrThreadSampler_lock        , PaddedMonitor, leaf,        true,  _safepoint_check_never);
  #endif
  
+   TSAN_RUNTIME_ONLY(
+     def(TsanOopMap_lock            , PaddedMutex  , special,     true,  _safepoint_check_never);
+   );
+ 
  #ifndef SUPPORTS_NATIVE_CX8
    def(UnsafeJlong_lock             , PaddedMutex  , special,     false, _safepoint_check_never);
  #endif
  
    def(CodeHeapStateAnalytics_lock  , PaddedMutex  , leaf,        true,  _safepoint_check_never);