<div dir="ltr">nice!</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Sat, Jul 12, 2014 at 3:34 AM, Alexey Samsonov <span dir="ltr"><<a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: samsonov<br>
Date: Fri Jul 11 18:34:26 2014<br>
New Revision: 212857<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=212857&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=212857&view=rev</a><br>
Log:<br>
[ASan] Improve ODR-violation error reports.<br>
<br>
Demangle names of involved globals. Print a more consistent summary line.<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/asan/asan_report.cc<br>
    compiler-rt/trunk/test/asan/TestCases/Linux/odr-violation.cc<br>
<br>
Modified: compiler-rt/trunk/lib/asan/asan_report.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_report.cc?rev=212857&r1=212856&r2=212857&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_report.cc?rev=212857&r1=212856&r2=212857&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/asan_report.cc (original)<br>
+++ compiler-rt/trunk/lib/asan/asan_report.cc Fri Jul 11 18:34:26 2014<br>
@@ -768,8 +768,10 @@ void ReportODRViolation(const __asan_glo<br>
   InternalScopedString g1_loc(256), g2_loc(256);<br>
   PrintGlobalLocation(&g1_loc, *g1);<br>
   PrintGlobalLocation(&g2_loc, *g2);<br>
-  Printf("  [1] size=%zd %s %s\n", g1->size, g1->name, g1_loc.data());<br>
-  Printf("  [2] size=%zd %s %s\n", g2->size, g2->name, g2_loc.data());<br>
+  Printf("  [1] size=%zd '%s' %s\n", g1->size,<br>
+         MaybeDemangleGlobalName(g1->name), g1_loc.data());<br>
+  Printf("  [2] size=%zd '%s' %s\n", g2->size,<br>
+         MaybeDemangleGlobalName(g2->name), g2_loc.data());<br>
   if (stack_id1 && stack_id2) {<br>
     Printf("These globals were registered at these points:\n");<br>
     Printf("  [1]:\n");<br>
@@ -782,7 +784,10 @@ void ReportODRViolation(const __asan_glo<br>
   }<br>
   Report("HINT: if you don't care about these warnings you may set "<br>
          "ASAN_OPTIONS=detect_odr_violation=0\n");<br>
-  ReportErrorSummary("odr-violation", g1_loc.data(), 0, g1->name);<br>
+  InternalScopedString error_msg(256);<br>
+  error_msg.append("odr-violation: global '%s' at %s",<br>
+                   MaybeDemangleGlobalName(g1->name), g1_loc.data());<br>
+  ReportErrorSummary(error_msg.data());<br>
 }<br>
<br>
 // ----------------------- CheckForInvalidPointerPair ----------- {{{1<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/Linux/odr-violation.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Linux/odr-violation.cc?rev=212857&r1=212856&r2=212857&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Linux/odr-violation.cc?rev=212857&r1=212856&r2=212857&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/Linux/odr-violation.cc (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/Linux/odr-violation.cc Fri Jul 11 18:34:26 2014<br>
@@ -23,19 +23,20 @@<br>
 #endif<br>
<br>
 #if BUILD_SO<br>
-char G[SZ];<br>
+namespace foo { char G[SZ]; }<br>
 #else<br>
 #include <stdio.h><br>
-char G[100];<br>
+namespace foo { char G[100]; }<br>
+// CHECK: ERROR: AddressSanitizer: odr-violation<br>
+// CHECK: size=100 'foo::G' {{.*}}odr-violation.cc:[[@LINE-2]]:22<br>
+// CHECK: size={{4|100}} 'foo::G'<br>
 int main(int argc, char **argv) {<br>
-  printf("PASS: %p\n", &G);<br>
+  printf("PASS: %p\n", &foo::G);<br>
 }<br>
 #endif<br>
<br>
-// CHECK: ERROR: AddressSanitizer: odr-violation<br>
-// CHECK: size=100 G<br>
-// CHECK: size={{4|100}} G<br>
 // CHECK: These globals were registered at these points:<br>
 // CHECK: ODR-EXE<br>
 // CHECK: ODR-SO<br>
+// CHECK: SUMMARY: AddressSanitizer: odr-violation: global 'foo::G' at {{.*}}odr-violation.cc<br>
 // DISABLED: PASS<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>