From 3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 5 Nov 2019 14:54:57 +0100 Subject: Libsanitizer: merge from trunk with merge.sh. 2019-11-05 Martin Liska * all source files: Merge from upstream r375507. From-SVN: r277834 --- libsanitizer/tsan/tsan_suppressions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libsanitizer/tsan/tsan_suppressions.cpp') diff --git a/libsanitizer/tsan/tsan_suppressions.cpp b/libsanitizer/tsan/tsan_suppressions.cpp index 6bf6720..a1c1bf8 100644 --- a/libsanitizer/tsan/tsan_suppressions.cpp +++ b/libsanitizer/tsan/tsan_suppressions.cpp @@ -50,7 +50,7 @@ static const char *kSuppressionTypes[] = { void InitializeSuppressions() { CHECK_EQ(nullptr, suppression_ctx); - suppression_ctx = new (suppression_placeholder) // NOLINT + suppression_ctx = new (suppression_placeholder) SuppressionContext(kSuppressionTypes, ARRAY_SIZE(kSuppressionTypes)); suppression_ctx->ParseFromFile(flags()->suppressions); #if !SANITIZER_GO -- cgit v1.1