aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/tsan/tsan_external.cpp
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2019-11-05 14:54:57 +0100
committerMartin Liska <marxin@gcc.gnu.org>2019-11-05 13:54:57 +0000
commit3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8 (patch)
treec3eb5c5658e168b819d23dd20aa46d614089c649 /libsanitizer/tsan/tsan_external.cpp
parent9bae89924afc811bd10e249856bf78dd19f20df2 (diff)
downloadgcc-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_external.cpp')
-rw-r--r--libsanitizer/tsan/tsan_external.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libsanitizer/tsan/tsan_external.cpp b/libsanitizer/tsan/tsan_external.cpp
index efc1013..0faa1ee 100644
--- a/libsanitizer/tsan/tsan_external.cpp
+++ b/libsanitizer/tsan/tsan_external.cpp
@@ -25,7 +25,7 @@ static TagData registered_tags[kExternalTagMax] = {
{},
{"Swift variable", "Swift access race"},
};
-static atomic_uint32_t used_tags{kExternalTagFirstUserAvailable}; // NOLINT.
+static atomic_uint32_t used_tags{kExternalTagFirstUserAvailable};
static TagData *GetTagData(uptr tag) {
// Invalid/corrupted tag? Better return NULL and let the caller deal with it.
if (tag >= atomic_load(&used_tags, memory_order_relaxed)) return nullptr;