[compiler-rt] a32a163 - [asan] Fix Windows tests after StripFunctionName() improvements

[Marco Elver via llvm-commits]

Author: Marco Elver
Date: 2023-05-25T17:54:50+02:00
New Revision: a32a16311050fbccc03638b197910dc1415f60ab

URL: https://github.com/llvm/llvm-project/commit/a32a16311050fbccc03638b197910dc1415f60ab
DIFF: https://github.com/llvm/llvm-project/commit/a32a16311050fbccc03638b197910dc1415f60ab.diff

LOG: [asan] Fix Windows tests after StripFunctionName() improvements

Stacktraces should no longer show __asan_wrap_, but the "normal"
function name.

Reflect that in tests.

Added: 
    

Modified: 
    compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cpp
    compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cpp
    compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cpp b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cpp
index f79e4d6dbcef5..0bdd350ed409b 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cpp
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cpp
@@ -24,7 +24,7 @@ int test_function() {
   call_memcpy(&memcpy, buff2, buff1, 6);
 // CHECK: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 6 at [[ADDR]] thread T0
-// CHECK-NEXT:  __asan_{{.*}}mem{{.*}}
+// CHECK-NEXT:  mem{{.*}}
 // CHECK-NEXT:  call_memcpy
 // CHECK-NEXT:  test_function {{.*}}dll_intercept_memcpy_indirect.cpp:[[@LINE-5]]
 // CHECK: Address [[ADDR]] is located in stack of thread T0 at offset {{.*}} in frame

diff  --git a/compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cpp b/compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cpp
index eda82a4279dcf..a80ab09b0e3bf 100644
--- a/compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cpp
+++ b/compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cpp
@@ -22,7 +22,7 @@ int main() {
   call_memcpy(&memcpy, buff2, buff1, 6);
 // CHECK: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 6 at [[ADDR]] thread T0
-// CHECK-NEXT:  __asan_{{.*}}mem{{.*}}
+// CHECK-NEXT:  mem{{.*}}
 // CHECK-NEXT:  call_mem{{.*}}
 // CHECK-NEXT:  main {{.*}}intercept_memcpy.cpp:[[@LINE-5]]
 // CHECK: Address [[ADDR]] is located in stack of thread T0 at offset {{.*}} in frame

diff  --git a/compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cpp b/compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cpp
index 244485ded36db..b519f53fe4269 100644
--- a/compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cpp
+++ b/compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cpp
@@ -23,7 +23,7 @@ int main() {
 //
 // The first frame is our wrapper normally but will be malloc in the dynamic
 // config.
-// CHECK:   #0 {{.*}} in {{malloc|__asan_wrap_strdup}}
+// CHECK:   #0 {{.*}} in {{malloc|strdup}}
 //
 // The local call to _strdup above may be the second or third frame depending
 // on whether we're using the dynamic config.