diff options
| author | Martin Liska <mliska@suse.cz> | 2019-11-05 14:54:57 +0100 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2019-11-05 13:54:57 +0000 |
| commit | 3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8 (patch) | |
| tree | c3eb5c5658e168b819d23dd20aa46d614089c649 /libsanitizer/tsan/tsan_suppressions.cpp | |
| parent | 9bae89924afc811bd10e249856bf78dd19f20df2 (diff) | |
| download | gcc-3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8.zip gcc-3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8.tar.gz gcc-3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8.tar.bz2 | |
Libsanitizer: merge from trunk with merge.sh.
2019-11-05 Martin Liska <mliska@suse.cz>
* all source files: Merge from upstream r375507.
From-SVN: r277834
Diffstat (limited to 'libsanitizer/tsan/tsan_suppressions.cpp')
| -rw-r--r-- | libsanitizer/tsan/tsan_suppressions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |