Merge pull request #45225 from ydb-platform/merge-rightlib-260701-1735

1 files changed, 8 insertions, 3 deletions

diff --git a/library/cpp/yt/threading/rw_spin_lock.cpp b/library/cpp/yt/threading/rw_spin_lock.cpp
index efc0e90167a..3150c1aa132 100644
--- a/library/cpp/yt/threading/rw_spin_lock.cpp
+++ b/library/cpp/yt/threading/rw_spin_lock.cpp
@@ -41,7 +41,8 @@ void TUncheckedReaderWriterSpinLock::AcquireWriterSlow() noexcept
 
 namespace {
 
-// NB: Reading this after destruction is UB, but we can't deal with Static Initialization Order Fiasco in any other feasible way :(
+// NB: Reading this after destruction is UB, but we can't deal with
+// Static Initialization Order Fiasco in any other feasible way :(
 YT_DEFINE_THREAD_LOCAL(bool, ThreadLockTrackerDestroyed, false);
 
 class TThreadLockTracker
@@ -61,13 +62,17 @@ public:
     ~TThreadLockTracker()
     {
         ThreadLockTrackerDestroyed() = true;
-    };
+    }
 
 private:
     THashSet<TCheckedReaderWriterSpinLock*> ThreadLocksAcquired_;
 };
 
-YT_DEFINE_THREAD_LOCAL(TThreadLockTracker, ThreadLockTracker);
+YT_PREVENT_TLS_CACHING static TThreadLockTracker& ThreadLockTracker()
+{
+    static thread_local TThreadLockTracker Instance;
+    return Instance;
+}
 
 } // namespace