<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Dec 18, 2014 at 2:19 AM, Dmitry Vyukov <span dir="ltr"><<a href="mailto:dvyukov@google.com" target="_blank">dvyukov@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dvyukov<br>
Date: Thu Dec 18 04:19:32 2014<br>
New Revision: 224508<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=224508&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=224508&view=rev</a><br>
Log:<br>
tsan: don't crash with NULL deref during reporting<br>
<br>
tctx==NULL crash observed during deadlock reporting.<br>
There seems to be some bugs in the deadlock detector,<br>
but it is still useful to be more robust during reporting.<br></blockquote><div><br>So you don't know why tctx is null in this case - isn't this a bit of a hack/workaround, rather than an actual fix, then? It's sort of unfortunate to build up cruft to tolerate violations of invariants we believe should hold... <br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc<br>
<br>
Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc?rev=224508&r1=224507&r2=224508&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc?rev=224508&r1=224507&r2=224508&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc (original)<br>
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc Thu Dec 18 04:19:32 2014<br>
@@ -251,7 +251,9 @@ ThreadContext *IsThreadStackOrTls(uptr a<br>
<br>
 void ScopedReport::AddThread(int unique_tid, bool suppressable) {<br>
 #ifndef SANITIZER_GO<br>
-  AddThread(FindThreadByUidLocked(unique_tid), suppressable);<br>
+  const ThreadContext *tctx = FindThreadByUidLocked(unique_tid);<br>
+  if (tctx)<br></blockquote><div><br>Usually we roll the variable declaration into the condition in cases like this.<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+    AddThread(FindThreadByUidLocked(unique_tid), suppressable);<br>
 #endif<br>
 }<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>