asan: fix tests

depending on -m32/-m64 addr2line says either e.g. __xsan_strnlen or just strnlen

llvm-svn: 157464

diff --git a/compiler-rt/lib/asan/output_tests/heap-overflow.cc b/compiler-rt/lib/asan/output_tests/heap-overflow.cc
index 57233e8..bc8a9f8 100644 (file)
--- a/compiler-rt/lib/asan/output_tests/heap-overflow.cc
+++ b/compiler-rt/lib/asan/output_tests/heap-overflow.cc
@@ -13,7 +13,7 @@ int main(int argc, char **argv) {
 // Check-Common: {{0x.* is located 0 bytes to the right of 10-byte region}}
 // Check-Common: {{allocated by thread T0 here:}}
 
-// Check-Linux: {{    #0 0x.* in __xsan_malloc}}
+// Check-Linux: {{    #0 0x.* in .*malloc}}
 // Check-Linux: {{    #1 0x.* in main .*heap-overflow.cc:[45]}}
 
 // Check-Darwin: {{    #0 0x.* in .*mz_malloc.*}}

diff --git a/compiler-rt/lib/asan/output_tests/strncpy-overflow.cc b/compiler-rt/lib/asan/output_tests/strncpy-overflow.cc
index 8b72d0f..0333622 100644 (file)
--- a/compiler-rt/lib/asan/output_tests/strncpy-overflow.cc
+++ b/compiler-rt/lib/asan/output_tests/strncpy-overflow.cc
@@ -9,13 +9,13 @@ int main(int argc, char **argv) {
 }
 
 // Check-Common: {{WRITE of size 1 at 0x.* thread T0}}
-// Check-Linux: {{    #0 0x.* in __xsan_strncpy}}
+// Check-Linux: {{    #0 0x.* in .*strncpy}}
 // Check-Darwin: {{    #0 0x.* in wrap_strncpy}}
 // Check-Common: {{    #1 0x.* in main .*strncpy-overflow.cc:[78]}}
 // Check-Common: {{0x.* is located 0 bytes to the right of 9-byte region}}
 // Check-Common: {{allocated by thread T0 here:}}
 
-// Check-Linux: {{    #0 0x.* in __xsan_malloc}}
+// Check-Linux: {{    #0 0x.* in .*malloc}}
 // Check-Linux: {{    #1 0x.* in main .*strncpy-overflow.cc:6}}
 
 // Check-Darwin: {{    #0 0x.* in .*mz_malloc.*}}

diff --git a/compiler-rt/lib/asan/output_tests/use-after-free.cc b/compiler-rt/lib/asan/output_tests/use-after-free.cc
index 5d6ab5f..7cc2a7f 100644 (file)
--- a/compiler-rt/lib/asan/output_tests/use-after-free.cc
+++ b/compiler-rt/lib/asan/output_tests/use-after-free.cc
@@ -12,7 +12,7 @@ int main() {
 // Check-Common: {{0x.* is located 5 bytes inside of 10-byte region .0x.*,0x.*}}
 // Check-Common: {{freed by thread T0 here:}}
 
-// Check-Linux: {{    #0 0x.* in __xsan_free}}
+// Check-Linux: {{    #0 0x.* in .*free}}
 // Check-Linux: {{    #1 0x.* in main .*use-after-free.cc:[45]}}
 
 // Check-Darwin: {{    #0 0x.* in .*mz_free.*}}
@@ -22,7 +22,7 @@ int main() {
 
 // Check-Common: {{previously allocated by thread T0 here:}}
 
-// Check-Linux: {{    #0 0x.* in __xsan_malloc}}
+// Check-Linux: {{    #0 0x.* in .*malloc}}
 // Check-Linux: {{    #1 0x.* in main .*use-after-free.cc:3}}
 
 // Check-Darwin: {{    #0 0x.* in .*mz_malloc.*}}