<div dir="ltr">is this testable? </div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Dec 11, 2014 at 8:12 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 11 10:12:16 2014<br>
New Revision: 224022<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=224022&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=224022&view=rev</a><br>
Log:<br>
tsan: don't subtract one from fake PCs<br>
<br>
These are fake and not actual PCs, more like function IDs.<br>
Pass them to external symbolizer untouched.<br>
<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc<br>
    compiler-rt/trunk/lib/tsan/rtl/tsan_symbolize.cc<br>
    compiler-rt/trunk/lib/tsan/rtl/tsan_symbolize.h<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=224022&r1=224021&r2=224022&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc?rev=224022&r1=224021&r2=224022&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 11 10:12:16 2014<br>
@@ -111,13 +111,14 @@ static ReportStack *SymbolizeStack(Stack<br>
   SymbolizedStack *top = nullptr;<br>
   for (uptr si = 0; si < trace.size; si++) {<br>
     const uptr pc = trace.trace[si];<br>
+    uptr pc1 = pc;<br>
 #ifndef SANITIZER_GO<br>
     // We obtain the return address, but we're interested in the previous<br>
     // instruction.<br>
-    const uptr pc1 = StackTrace::GetPreviousInstructionPc(pc);<br>
+    if ((pc & kExternalPCBit) == 0)<br>
+      pc1 = StackTrace::GetPreviousInstructionPc(pc);<br>
 #else<br>
     // FIXME(dvyukov): Go sometimes uses address of a function as top pc.<br>
-    uptr pc1 = pc;<br>
     if (si != trace.size - 1)<br>
       pc1 -= 1;<br>
 #endif<br>
<br>
Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_symbolize.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_symbolize.cc?rev=224022&r1=224021&r2=224022&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_symbolize.cc?rev=224022&r1=224021&r2=224022&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/rtl/tsan_symbolize.cc (original)<br>
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_symbolize.cc Thu Dec 11 10:12:16 2014<br>
@@ -36,10 +36,6 @@ void ExitSymbolizer() {<br>
   thr->ignore_interceptors--;<br>
 }<br>
<br>
-// Denotes fake PC values that come from JIT/JAVA/etc.<br>
-// For such PC values __tsan_symbolize_external() will be called.<br>
-const uptr kExternalPCBit = 1ULL << 60;<br>
-<br>
 // May be overriden by JIT/JAVA/etc,<br>
 // whatever produces PCs marked with kExternalPCBit.<br>
 extern "C" bool __tsan_symbolize_external(uptr pc,<br>
<br>
Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_symbolize.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_symbolize.h?rev=224022&r1=224021&r2=224022&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_symbolize.h?rev=224022&r1=224021&r2=224022&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/rtl/tsan_symbolize.h (original)<br>
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_symbolize.h Thu Dec 11 10:12:16 2014<br>
@@ -18,6 +18,10 @@<br>
<br>
 namespace __tsan {<br>
<br>
+// Denotes fake PC values that come from JIT/JAVA/etc.<br>
+// For such PC values __tsan_symbolize_external() will be called.<br>
+const uptr kExternalPCBit = 1ULL << 60;<br>
+<br>
 void EnterSymbolizer();<br>
 void ExitSymbolizer();<br>
 SymbolizedStack *SymbolizeCode(uptr addr);<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>