| commit | 15190a6f0f086737f2fcffe16a58ed42939ef081 | [log] [tgz] |
|---|---|---|
| author | Dmitry Vyukov <dvyukov@google.com> | Thu Feb 14 11:03:45 2013 +0000 |
| committer | Dmitry Vyukov <dvyukov@google.com> | Thu Feb 14 11:03:45 2013 +0000 |
| tree | a3f7aae35e1870d532ac1cc5550bddeed52d5528 | |
| parent | 7b7801d0811e7091240ddbfdcff817791973ef6f [diff] [blame] |
tsan: fix bug in suppression reading (suppressions from file were discarded) git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@175153 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/tsan/rtl/tsan_suppressions.cc b/lib/tsan/rtl/tsan_suppressions.cc index 3419c3b..941c208 100644 --- a/lib/tsan/rtl/tsan_suppressions.cc +++ b/lib/tsan/rtl/tsan_suppressions.cc
@@ -140,7 +140,7 @@ g_suppressions = SuppressionParse(0, supp); #ifndef TSAN_GO supp = __tsan_default_suppressions(); - g_suppressions = SuppressionParse(0, supp); + g_suppressions = SuppressionParse(g_suppressions, supp); #endif }