From 605f2df106ad30f0127848630b69a0fb6375e8e7 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Tue, 27 Jan 2015 23:06:48 +0000 Subject: [PATCH] [ASan] Fix test cases: don't assume that fast unwinder can't unwind through libc. llvm-svn: 227265 --- compiler-rt/test/asan/TestCases/Linux/malloc-in-qsort.cc | 7 ++----- compiler-rt/test/asan/TestCases/Linux/overflow-in-qsort.cc | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/compiler-rt/test/asan/TestCases/Linux/malloc-in-qsort.cc b/compiler-rt/test/asan/TestCases/Linux/malloc-in-qsort.cc index 545bc7e42a17..80af409d66a9 100644 --- a/compiler-rt/test/asan/TestCases/Linux/malloc-in-qsort.cc +++ b/compiler-rt/test/asan/TestCases/Linux/malloc-in-qsort.cc @@ -39,15 +39,12 @@ int main() { return GlobalPtr[10]; } -// Fast unwind: can not unwind through qsort. -// FIXME: this test does not properly work with slow unwind yet. - +// Fast unwind may not unwind through qsort. // CHECK-FAST: ERROR: AddressSanitizer: heap-buffer-overflow // CHECK-FAST: is located 0 bytes to the right // CHECK-FAST: #0{{.*}}operator new // CHECK-FAST-NEXT: #1{{.*}}QsortCallback -// CHECK-FAST-NOT: MyQsort -// + // CHECK-SLOW: ERROR: AddressSanitizer: heap-buffer-overflow // CHECK-SLOW: is located 0 bytes to the right // CHECK-SLOW: #0{{.*}}operator new diff --git a/compiler-rt/test/asan/TestCases/Linux/overflow-in-qsort.cc b/compiler-rt/test/asan/TestCases/Linux/overflow-in-qsort.cc index 79b654e117cd..21bdff60cd30 100644 --- a/compiler-rt/test/asan/TestCases/Linux/overflow-in-qsort.cc +++ b/compiler-rt/test/asan/TestCases/Linux/overflow-in-qsort.cc @@ -37,11 +37,9 @@ int main() { MyQsort(a, 2); } -// Fast unwind: can not unwind through qsort. - +// Fast unwind may not unwind through qsort. // CHECK-FAST: ERROR: AddressSanitizer: global-buffer-overflow // CHECK-FAST: #0{{.*}} in QsortCallback -// CHECK-FAST-NOT: MyQsort // CHECK-FAST: is located 0 bytes to the right of global variable 'global_array // CHECK-SLOW: ERROR: AddressSanitizer: global-buffer-overflow