<div dir="ltr"><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Feb 22, 2015 at 10:58 AM, Renato Golin <span dir="ltr"><<a href="mailto:renato.golin@linaro.org" target="_blank">renato.golin@linaro.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rengolin<br>
Date: Sun Feb 22 12:58:18 2015<br>
New Revision: 230179<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=230179&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=230179&view=rev</a><br>
Log:<br>
Revert "[ASan] Make the argument of '__sanitizer_annotate_contiguous_container' is not aligned error message easier to understand"<br>
<br>
This reverts commit r230019, as it was breaking the ARM sanitizer buildbot<br>
and let other errors be introduced since it wasn't fixed/reverted in<br>
time.<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/asan/asan_report.cc<br>
    compiler-rt/trunk/test/asan/TestCases/contiguous_container_crash.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=230179&r1=230178&r2=230179&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_report.cc?rev=230179&r1=230178&r2=230179&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/asan/asan_report.cc (original)<br>
+++ compiler-rt/trunk/lib/asan/asan_report.cc Sun Feb 22 12:58:18 2015<br>
@@ -834,8 +834,6 @@ void ReportBadParamsToAnnotateContiguous<br>
          "      old_mid : %p\n"<br>
          "      new_mid : %p\n",<br>
          beg, end, old_mid, new_mid);<br>
-  if (!IsAligned(beg, SHADOW_GRANULARITY))<br>
-    Report("ERROR: beg is not aligned by %d\n", SHADOW_GRANULARITY);<br>
   stack->Print();<br>
   ReportErrorSummary("bad-__sanitizer_annotate_contiguous_container", stack);<br>
 }<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/contiguous_container_crash.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/contiguous_container_crash.cc?rev=230179&r1=230178&r2=230179&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/contiguous_container_crash.cc?rev=230179&r1=230178&r2=230179&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/contiguous_container_crash.cc (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/contiguous_container_crash.cc Sun Feb 22 12:58:18 2015<br>
@@ -1,7 +1,6 @@<br>
 // RUN: %clangxx_asan -O %s -o %t<br>
 // RUN: not %run %t crash 2>&1 | FileCheck --check-prefix=CHECK-CRASH %s<br>
-// RUN: not %run %t bad-bounds 2>&1 | FileCheck --check-prefix=CHECK-BAD-BOUNDS %s<br>
-// RUN: not %run %t bad-alignment 2>&1 | FileCheck --check-prefix=CHECK-BAD-ALIGNMENT %s<br>
+// RUN: not %run %t bad-bounds 2>&1 | FileCheck --check-prefix=CHECK-BAD %s<br>
 // RUN: env ASAN_OPTIONS=detect_container_overflow=0 %run %t crash<br>
 //<br>
 // Test crash due to __sanitizer_annotate_contiguous_container.<br>
@@ -22,31 +21,21 @@ int TestCrash() {<br>
   t[60] = 0;<br>
   __sanitizer_annotate_contiguous_container(&t[0], &t[0] + 100, &t[0] + 100,<br>
                                             &t[0] + 50);<br>
-// CHECK-CRASH: AddressSanitizer: container-overflow<br>
   return (int)t[60 * one];  // Touches the poisoned memory.<br>
 }<br>
<br>
 void BadBounds() {<br>
   long t[100];<br>
-// CHECK-BAD-BOUNDS: ERROR: AddressSanitizer: bad parameters to __sanitizer_annotate_contiguous_container<br>
   __sanitizer_annotate_contiguous_container(&t[0], &t[0] + 100, &t[0] + 101,<br>
                                             &t[0] + 50);<br>
 }<br>
<br>
-void BadAlignment() {<br>
-  int t[100];<br>
-// CHECK-BAD-ALIGNMENT: ERROR: AddressSanitizer: bad parameters to __sanitizer_annotate_contiguous_container<br>
-// CHECK-BAD-ALIGNMENT: ERROR: beg is not aligned by 8<br>
-  __sanitizer_annotate_contiguous_container(&t[1], &t[0] + 100, &t[1] + 10,<br>
-                                            &t[0] + 50);<br>
-}<br>
-<br>
 int main(int argc, char **argv) {<br>
   assert(argc == 2);<br>
   if (!strcmp(argv[1], "crash"))<br>
     return TestCrash();<br>
   else if (!strcmp(argv[1], "bad-bounds"))<br>
     BadBounds();<br>
-  else if (!strcmp(argv[1], "bad-alignment"))<br>
-    BadAlignment();<br>
 }<br>
+// CHECK-CRASH: AddressSanitizer: container-overflow<br>
+// CHECK-BAD: ERROR: AddressSanitizer: bad parameters to __sanitizer_annotate_contiguous_container<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>