[llvm-branch-commits] [compiler-rt-branch] r259803 - Merging r259755:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Feb  4 11:02:20 2016
New Revision: 259803

URL: http://llvm.org/viewvc/llvm-project?rev=259803&view=rev
Log:
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
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_38/   (props changed)
    compiler-rt/branches/release_38/lib/tsan/rtl/tsan_suppressions.cc

Propchange: compiler-rt/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  4 11:02:20 2016
@@ -1 +1 @@
-/compiler-rt/trunk:258916
+/compiler-rt/trunk:258916,259755

Modified: compiler-rt/branches/release_38/lib/tsan/rtl/tsan_suppressions.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/lib/tsan/rtl/tsan_suppressions.cc?rev=259803&r1=259802&r2=259803&view=diff
==============================================================================
--- compiler-rt/branches/release_38/lib/tsan/rtl/tsan_suppressions.cc (original)
+++ compiler-rt/branches/release_38/lib/tsan/rtl/tsan_suppressions.cc Thu Feb  4 11:02:20 2016
@@ -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