summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2016-02-04 17:02:20 +0000
committerHans Wennborg <hans@hanshq.net>2016-02-04 17:02:20 +0000
commitff94979d5ab6240decea26c18b291141f51f4873 (patch)
treee3c3034588b68e43fd1bffd3aa19c8d4ed127b74
parent78bd1bedb55ce6e5f53f68ac2a1b9d088a4d9f7c (diff)
downloadcompiler-rt-ff94979d5ab6240decea26c18b291141f51f4873.tar.gz
Merging r259755:
------------------------------------------------------------------------ r259755 | mohit.bhakkad | 2016-02-03 21:28:48 -0800 (Wed, 03 Feb 2016) | 5 lines [TSan] Fix PrintMatchedSuppressions: Read hit count for suppression atomically Reviewers: dvyukov. Subscribers: jaydeep, sagar, dsanders, llvm-commits. Differential Revision: http://reviews.llvm.org/D16845 ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_38@259803 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/tsan/rtl/tsan_suppressions.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tsan/rtl/tsan_suppressions.cc b/lib/tsan/rtl/tsan_suppressions.cc
index 8754b61c6..b992d78f8 100644
--- a/lib/tsan/rtl/tsan_suppressions.cc
+++ b/lib/tsan/rtl/tsan_suppressions.cc
@@ -159,8 +159,8 @@ void PrintMatchedSuppressions() {
Printf("ThreadSanitizer: Matched %d suppressions (pid=%d):\n", hit_count,
(int)internal_getpid());
for (uptr i = 0; i < matched.size(); i++) {
- Printf("%d %s:%s\n", matched[i]->hit_count, matched[i]->type,
- matched[i]->templ);
+ Printf("%d %s:%s\n", atomic_load_relaxed(&matched[i]->hit_count),
+ matched[i]->type, matched[i]->templ);
}
}
} // namespace __tsan