From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Wed, 11 Mar 2015 19:20:03 +0000 (+0000)
Subject: tsan_rtl_report.cc (ScopedReport::AddThread): Cherry pick upstream 224508 and 224755.
X-Git-Tag: releases/gcc-5.1.0~492
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=563fb64a576a9a4abbe8f03f593ce0862842a1e8;p=thirdparty%2Fgcc.git

tsan_rtl_report.cc (ScopedReport::AddThread): Cherry pick upstream 224508 and 224755.

2015-03-11  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        * tsan/tsan_rtl_report.cc (ScopedReport::AddThread): Cherry pick
        upstream 224508 and 224755.

From-SVN: r221356
---

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 129de3b20d50..6086c09c46cd 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-11  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	* tsan/tsan_rtl_report.cc (ScopedReport::AddThread): Cherry pick
+	upstream 224508 and 224755.
+
 2015-03-09  Jakub Jelinek  <jakub@redhat.com>
 
 	PR sanitizer/63958
diff --git a/libsanitizer/tsan/tsan_rtl_report.cc b/libsanitizer/tsan/tsan_rtl_report.cc
index 11ec8381de6e..f86cfd4681de 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
 }