[compiler-rt] r261660 - tsan: clean up code after r261658

[Dmitry Vyukov via llvm-commits]

Author: dvyukov
Date: Tue Feb 23 11:58:23 2016
New Revision: 261660

URL: http://llvm.org/viewvc/llvm-project?rev=261660&view=rev
Log:
tsan: clean up code after r261658


Removed:
    compiler-rt/trunk/test/tsan/ignore_lib4.cc.supp
Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc
    compiler-rt/trunk/test/tsan/ignore_lib4.cc

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc?rev=261660&r1=261659&r2=261660&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc Tue Feb 23 11:58:23 2016
@@ -2051,8 +2051,6 @@ void ALWAYS_INLINE rtl_generic_sighandle
       (sctx && atomic_load(&sctx->in_blocking_func, memory_order_relaxed))) {
     atomic_fetch_add(&thr->in_signal_handler, 1, memory_order_relaxed);
     if (sctx && atomic_load(&sctx->in_blocking_func, memory_order_relaxed)) {
-      // We ignore interceptors in blocking functions,
-      // temporary enbled them again while we are calling user function.
       atomic_store(&sctx->in_blocking_func, 0, memory_order_relaxed);
       CallUserSignalHandler(thr, sync, true, sigact, sig, info, ctx);
       atomic_store(&sctx->in_blocking_func, 1, memory_order_relaxed);

Modified: compiler-rt/trunk/test/tsan/ignore_lib4.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/ignore_lib4.cc?rev=261660&r1=261659&r2=261660&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/ignore_lib4.cc (original)
+++ compiler-rt/trunk/test/tsan/ignore_lib4.cc Tue Feb 23 11:58:23 2016
@@ -1,6 +1,7 @@
 // RUN: %clangxx_tsan -O1 %s -DLIB -fPIC -shared -o %T/libignore_lib4.so
 // RUN: %clangxx_tsan -O1 %s -o %t
-// RUN: %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s
+// RUN: echo "called_from_lib:libignore_lib4.so" > %t.supp
+// RUN: %env_tsan_opts=suppressions='%t.supp' %run %t 2>&1 | FileCheck %s
 
 // Longjmp assembly has not been implemented for mips64 yet
 // XFAIL: mips64

Removed: compiler-rt/trunk/test/tsan/ignore_lib4.cc.supp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/ignore_lib4.cc.supp?rev=261659&view=auto
==============================================================================
--- compiler-rt/trunk/test/tsan/ignore_lib4.cc.supp (original)
+++ compiler-rt/trunk/test/tsan/ignore_lib4.cc.supp (removed)
@@ -1 +0,0 @@
-called_from_lib:libignore_lib4.so