From 400e957b18e908c38370bc16e2ea9723a826ab76 Mon Sep 17 00:00:00 2001 From: edlinger Date: Wed, 11 Mar 2015 19:20:03 +0000 Subject: 2015-03-11 Bernd Edlinger * 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 --- libsanitizer/ChangeLog | 5 +++++ libsanitizer/tsan/tsan_rtl_report.cc | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'libsanitizer') diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 129de3b20d5..6086c09c46c 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,8 @@ +2015-03-11 Bernd Edlinger + + * tsan/tsan_rtl_report.cc (ScopedReport::AddThread): Cherry pick + upstream 224508 and 224755. + 2015-03-09 Jakub Jelinek PR sanitizer/63958 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 } -- cgit v1.2.3