[llvm-commits] [compiler-rt] r157744 - /compiler-rt/trunk/lib/tsan/rtl/tsan_suppressions.cc

[Dmitry Vyukov]

Author: dvyukov
Date: Thu May 31 09:24:10 2012
New Revision: 157744

URL: http://llvm.org/viewvc/llvm-project?rev=157744&view=rev
Log:
tsan: fix a typo

Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_suppressions.cc

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_suppressions.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_suppressions.cc?rev=157744&r1=157743&r2=157744&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_suppressions.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_suppressions.cc Thu May 31 09:24:10 2012
@@ -148,9 +148,9 @@
     return false;
   for (const ReportStack *frame = stack; frame; frame = frame->next) {
     for (Suppression *supp = g_suppressions; supp; supp = supp->next) {
-      if (stype == supp->type ||
-          SuppressionMatch(supp->templ, frame->func) ||
-          SuppressionMatch(supp->templ, frame->file)) {
+      if (stype == supp->type &&
+          (SuppressionMatch(supp->templ, frame->func) ||
+          SuppressionMatch(supp->templ, frame->file))) {
         DPrintf("ThreadSanitizer: matched suppression '%s'\n", supp->templ);
         return true;
       }