[compiler-rt] [tsan] Fix running check-ubsan with COMPILER_RT_DEBUG=ON (PR #83890)

Alexander Richardson via llvm-commits llvm-commits at lists.llvm.org
Mon Mar 4 10:48:32 PST 2024


https://github.com/arichardson updated https://github.com/llvm/llvm-project/pull/83890

>From c6277c47c948e12cb8ee8502e6acdc24331dcc52 Mon Sep 17 00:00:00 2001
From: Alex Richardson <alexrichardson at google.com>
Date: Mon, 4 Mar 2024 10:41:13 -0800
Subject: [PATCH 1/2] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20in?=
 =?UTF-8?q?itial=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Created using spr 1.3.6-beta.1
---
 compiler-rt/lib/sanitizer_common/sanitizer_mutex.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_mutex.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_mutex.cpp
index 40fe56661250e5..41d6d2a7782347 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_mutex.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_mutex.cpp
@@ -212,7 +212,7 @@ struct InternalDeadlockDetector {
     return initialized > 0;
   }
 };
-
+__attribute__((tls_model("initial-exec")))
 static THREADLOCAL InternalDeadlockDetector deadlock_detector;
 
 void CheckedMutex::LockImpl(uptr pc) { deadlock_detector.Lock(type_, pc); }

>From 72988abd9f67ebd308e83e4f7d917e464331f12f Mon Sep 17 00:00:00 2001
From: Alex Richardson <alexrichardson at google.com>
Date: Mon, 4 Mar 2024 10:48:15 -0800
Subject: [PATCH 2/2] clang-format

Created using spr 1.3.6-beta.1
---
 compiler-rt/lib/sanitizer_common/sanitizer_mutex.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_mutex.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_mutex.cpp
index 41d6d2a7782347..1cadca4be382b6 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_mutex.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_mutex.cpp
@@ -212,8 +212,8 @@ struct InternalDeadlockDetector {
     return initialized > 0;
   }
 };
-__attribute__((tls_model("initial-exec")))
-static THREADLOCAL InternalDeadlockDetector deadlock_detector;
+__attribute__((tls_model("initial-exec"))) static THREADLOCAL
+    InternalDeadlockDetector deadlock_detector;
 
 void CheckedMutex::LockImpl(uptr pc) { deadlock_detector.Lock(type_, pc); }
 



More information about the llvm-commits mailing list