diff options
| author | Hans Wennborg <hans@hanshq.net> | 2019-08-09 10:15:41 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2019-08-09 10:15:41 +0000 |
| commit | 10f4dfa49218360ca0f2a02e612c3c3741a48002 (patch) | |
| tree | 718248ce302331014fad43137496a866594240a9 | |
| parent | ac146749f28828e28e28413188dfd153a9884f45 (diff) | |
| download | compiler-rt-10f4dfa49218360ca0f2a02e612c3c3741a48002.tar.gz | |
Merge r368103 '[TSAN] Fix tsan on FreeBSD after D54889'
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_90@368426 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/tsan/rtl/tsan_rtl.cc | 1 | ||||
| -rw-r--r-- | test/tsan/ignored-interceptors-mmap.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/tsan/rtl/tsan_rtl.cc b/lib/tsan/rtl/tsan_rtl.cc index 8a2704ff0..897679128 100644 --- a/lib/tsan/rtl/tsan_rtl.cc +++ b/lib/tsan/rtl/tsan_rtl.cc @@ -149,6 +149,7 @@ static void BackgroundThread(void *arg) { // We don't use ScopedIgnoreInterceptors, because we want ignores to be // enabled even when the thread function exits (e.g. during pthread thread // shutdown code). + cur_thread_init(); cur_thread()->ignore_interceptors++; const u64 kMs2Ns = 1000 * 1000; diff --git a/test/tsan/ignored-interceptors-mmap.cc b/test/tsan/ignored-interceptors-mmap.cc index bb43250a6..bcfafa409 100644 --- a/test/tsan/ignored-interceptors-mmap.cc +++ b/test/tsan/ignored-interceptors-mmap.cc @@ -1,7 +1,7 @@ // RUN: %clangxx_tsan -O0 %s -o %t // RUN: not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-RACE // RUN: %run %t ignore 2>&1 | FileCheck %s --check-prefix=CHECK-IGNORE -// XFAIL: freebsd,netbsd +// XFAIL: netbsd #include <sys/mman.h> #include <string.h> |