[llvm-branch-commits] [compiler-rt-branch] r368426 - Merge r368103 '[TSAN] Fix tsan on FreeBSD after D54889'

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Aug  9 03:15:41 2019
New Revision: 368426

URL: http://llvm.org/viewvc/llvm-project?rev=368426&view=rev
Log:
Merge r368103 '[TSAN] Fix tsan on FreeBSD after D54889'

Modified:
    compiler-rt/branches/release_90/lib/tsan/rtl/tsan_rtl.cc
    compiler-rt/branches/release_90/test/tsan/ignored-interceptors-mmap.cc

Modified: compiler-rt/branches/release_90/lib/tsan/rtl/tsan_rtl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_90/lib/tsan/rtl/tsan_rtl.cc?rev=368426&r1=368425&r2=368426&view=diff
==============================================================================
--- compiler-rt/branches/release_90/lib/tsan/rtl/tsan_rtl.cc (original)
+++ compiler-rt/branches/release_90/lib/tsan/rtl/tsan_rtl.cc Fri Aug  9 03:15:41 2019
@@ -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;
 

Modified: compiler-rt/branches/release_90/test/tsan/ignored-interceptors-mmap.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_90/test/tsan/ignored-interceptors-mmap.cc?rev=368426&r1=368425&r2=368426&view=diff
==============================================================================
--- compiler-rt/branches/release_90/test/tsan/ignored-interceptors-mmap.cc (original)
+++ compiler-rt/branches/release_90/test/tsan/ignored-interceptors-mmap.cc Fri Aug  9 03:15:41 2019
@@ -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>