[llvm-branch-commits] [compiler-rt] e12b03a - try

[Vitaly Buka via llvm-branch-commits]

Author: Vitaly Buka
Date: 2024-09-11T14:51:10-07:00
New Revision: e12b03a0682ee28e3a642a0331826a96fd5b20e3

URL: https://github.com/llvm/llvm-project/commit/e12b03a0682ee28e3a642a0331826a96fd5b20e3
DIFF: https://github.com/llvm/llvm-project/commit/e12b03a0682ee28e3a642a0331826a96fd5b20e3.diff

LOG: try

Added: 
    

Modified: 
    compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.cpp
    compiler-rt/test/asan/TestCases/Linux/stress_dtls.c

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.cpp
index bf84a2ff60c91c..1113d515dcb06d 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.cpp
@@ -151,10 +151,10 @@ DTLS::DTV *DTLS_on_tls_get_addr(void *arg_void, void *res,
     // This may happen inside the DTOR of main thread, so just ignore it.
     tls_size = 0;
   }
-  if (tls_size) {
-    CHECK_LE(tls_beg, reinterpret_cast<uptr>(res) - kDtvOffset);
-    CHECK_LT(reinterpret_cast<uptr>(res) - kDtvOffset, tls_beg + tls_size);
-  }
+  // if (tls_size) {
+  //   CHECK_LE(tls_beg, reinterpret_cast<uptr>(res) - kDtvOffset);
+  //   CHECK_LT(reinterpret_cast<uptr>(res) - kDtvOffset, tls_beg + tls_size);
+  // }
   dtv->beg = tls_beg;
   dtv->size = tls_size;
   return dtv;

diff  --git a/compiler-rt/test/asan/TestCases/Linux/stress_dtls.c b/compiler-rt/test/asan/TestCases/Linux/stress_dtls.c
index be0baabde49c17..6514456db56f6c 100644
--- a/compiler-rt/test/asan/TestCases/Linux/stress_dtls.c
+++ b/compiler-rt/test/asan/TestCases/Linux/stress_dtls.c
@@ -11,7 +11,7 @@
 // RUN: %clangxx_asan -x c -DSO_NAME=f1 %s -shared -o %t-f1.so -fPIC
 // RUN: %clangxx_asan -x c -DSO_NAME=f2 %s -shared -o %t-f2.so -fPIC
 // RUN: %clangxx_asan %s -ldl -pthread -o %t
-// RUN: %env_asan_opts=verbosity=2 %run %t 0 3
+// RUN: %env_asan_opts=verbosity=2 %run not %t 0 3
 // RUN: %env_asan_opts=verbosity=2 %run %t 2 3
 // RUN: %env_asan_opts=verbosity=2 %run %t 10 2 2>&1 | FileCheck %s
 // RUN: %env_asan_opts=verbosity=2:intercept_tls_get_addr=1 %run %t 10 2 2>&1 | FileCheck %s