[compiler-rt] r230179 - Revert "[ASan] Make the argument of '__sanitizer_annotate_contiguous_container' is not aligned error message easier to understand"

[Kostya Serebryany]

On Sun, Feb 22, 2015 at 10:58 AM, Renato Golin <renato.golin at linaro.org>
wrote:

> Author: rengolin
> Date: Sun Feb 22 12:58:18 2015
> New Revision: 230179
>
> URL: http://llvm.org/viewvc/llvm-project?rev=230179&view=rev
> Log:
> Revert "[ASan] Make the argument of
> '__sanitizer_annotate_contiguous_container' is not aligned error message
> easier to understand"
>
> This reverts commit r230019, as it was breaking the ARM sanitizer buildbot
> and let other errors be introduced since it wasn't fixed/reverted in
> time.
>
> Modified:
>     compiler-rt/trunk/lib/asan/asan_report.cc
>     compiler-rt/trunk/test/asan/TestCases/contiguous_container_crash.cc
>
> Modified: compiler-rt/trunk/lib/asan/asan_report.cc
> URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_report.cc?rev=230179&r1=230178&r2=230179&view=diff
>
> ==============================================================================
> --- compiler-rt/trunk/lib/asan/asan_report.cc (original)
> +++ compiler-rt/trunk/lib/asan/asan_report.cc Sun Feb 22 12:58:18 2015
> @@ -834,8 +834,6 @@ void ReportBadParamsToAnnotateContiguous
>           "      old_mid : %p\n"
>           "      new_mid : %p\n",
>           beg, end, old_mid, new_mid);
> -  if (!IsAligned(beg, SHADOW_GRANULARITY))
> -    Report("ERROR: beg is not aligned by %d\n", SHADOW_GRANULARITY);
>    stack->Print();
>    ReportErrorSummary("bad-__sanitizer_annotate_contiguous_container",
> stack);
>  }
>
> Modified:
> compiler-rt/trunk/test/asan/TestCases/contiguous_container_crash.cc
> URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/contiguous_container_crash.cc?rev=230179&r1=230178&r2=230179&view=diff
>
> ==============================================================================
> --- compiler-rt/trunk/test/asan/TestCases/contiguous_container_crash.cc
> (original)
> +++ compiler-rt/trunk/test/asan/TestCases/contiguous_container_crash.cc
> Sun Feb 22 12:58:18 2015
> @@ -1,7 +1,6 @@
>  // RUN: %clangxx_asan -O %s -o %t
>  // RUN: not %run %t crash 2>&1 | FileCheck --check-prefix=CHECK-CRASH %s
> -// RUN: not %run %t bad-bounds 2>&1 | FileCheck
> --check-prefix=CHECK-BAD-BOUNDS %s
> -// RUN: not %run %t bad-alignment 2>&1 | FileCheck
> --check-prefix=CHECK-BAD-ALIGNMENT %s
> +// RUN: not %run %t bad-bounds 2>&1 | FileCheck --check-prefix=CHECK-BAD
> %s
>  // RUN: env ASAN_OPTIONS=detect_container_overflow=0 %run %t crash
>  //
>  // Test crash due to __sanitizer_annotate_contiguous_container.
> @@ -22,31 +21,21 @@ int TestCrash() {
>    t[60] = 0;
>    __sanitizer_annotate_contiguous_container(&t[0], &t[0] + 100, &t[0] +
> 100,
>                                              &t[0] + 50);
> -// CHECK-CRASH: AddressSanitizer: container-overflow
>    return (int)t[60 * one];  // Touches the poisoned memory.
>  }
>
>  void BadBounds() {
>    long t[100];
> -// CHECK-BAD-BOUNDS: ERROR: AddressSanitizer: bad parameters to
> __sanitizer_annotate_contiguous_container
>    __sanitizer_annotate_contiguous_container(&t[0], &t[0] + 100, &t[0] +
> 101,
>                                              &t[0] + 50);
>  }
>
> -void BadAlignment() {
> -  int t[100];
> -// CHECK-BAD-ALIGNMENT: ERROR: AddressSanitizer: bad parameters to
> __sanitizer_annotate_contiguous_container
> -// CHECK-BAD-ALIGNMENT: ERROR: beg is not aligned by 8
> -  __sanitizer_annotate_contiguous_container(&t[1], &t[0] + 100, &t[1] +
> 10,
> -                                            &t[0] + 50);
> -}
> -
>  int main(int argc, char **argv) {
>    assert(argc == 2);
>    if (!strcmp(argv[1], "crash"))
>      return TestCrash();
>    else if (!strcmp(argv[1], "bad-bounds"))
>      BadBounds();
> -  else if (!strcmp(argv[1], "bad-alignment"))
> -    BadAlignment();
>  }
> +// CHECK-CRASH: AddressSanitizer: container-overflow
> +// CHECK-BAD: ERROR: AddressSanitizer: bad parameters to
> __sanitizer_annotate_contiguous_container
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150223/db9ac1a2/attachment.html>