diff options
author | edlinger <edlinger@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-11 19:20:03 +0000 |
---|---|---|
committer | edlinger <edlinger@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-11 19:20:03 +0000 |
commit | 400e957b18e908c38370bc16e2ea9723a826ab76 (patch) | |
tree | 2970fbf92bf18ad457d8560a2939ce7675d6bdad /libsanitizer/tsan | |
parent | fb51f994c2cd5f2ec52306fc29b0435551d61963 (diff) | |
download | gcc-400e957b18e908c38370bc16e2ea9723a826ab76.tar.gz |
2015-03-11 Bernd Edlinger <bernd.edlinger@hotmail.de>
* tsan/tsan_rtl_report.cc (ScopedReport::AddThread): Cherry pick
upstream 224508 and 224755.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221356 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer/tsan')
-rw-r--r-- | libsanitizer/tsan/tsan_rtl_report.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libsanitizer/tsan/tsan_rtl_report.cc b/libsanitizer/tsan/tsan_rtl_report.cc index 11ec8381de6..f86cfd4681d 100644 --- a/libsanitizer/tsan/tsan_rtl_report.cc +++ b/libsanitizer/tsan/tsan_rtl_report.cc @@ -242,7 +242,8 @@ ThreadContext *IsThreadStackOrTls(uptr addr, bool *is_stack) { void ScopedReport::AddThread(int unique_tid, bool suppressable) { #ifndef TSAN_GO - AddThread(FindThreadByUidLocked(unique_tid), suppressable); + if (const ThreadContext *tctx = FindThreadByUidLocked(unique_tid)) + AddThread(tctx, suppressable); #endif } |