[compiler-rt] r175153 - tsan: fix bug in suppression reading (suppressions from file were discarded)

[Dmitry Vyukov]

Author: dvyukov
Date: Thu Feb 14 05:03:45 2013
New Revision: 175153

URL: http://llvm.org/viewvc/llvm-project?rev=175153&view=rev
Log:
tsan: fix bug in suppression reading (suppressions from file were discarded)

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=175153&r1=175152&r2=175153&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_suppressions.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_suppressions.cc Thu Feb 14 05:03:45 2013
@@ -140,7 +140,7 @@ void InitializeSuppressions() {
   g_suppressions = SuppressionParse(0, supp);
 #ifndef TSAN_GO
   supp = __tsan_default_suppressions();
-  g_suppressions = SuppressionParse(0, supp);
+  g_suppressions = SuppressionParse(g_suppressions, supp);
 #endif
 }