Skip to content

Commit a32a163

Browse files
committed
[asan] Fix Windows tests after StripFunctionName() improvements
Stacktraces should no longer show __asan_wrap_, but the "normal" function name. Reflect that in tests.
1 parent d07f23e commit a32a163

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ int test_function() {
2424
call_memcpy(&memcpy, buff2, buff1, 6);
2525
// CHECK: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
2626
// CHECK: WRITE of size 6 at [[ADDR]] thread T0
27-
// CHECK-NEXT: __asan_{{.*}}mem{{.*}}
27+
// CHECK-NEXT: mem{{.*}}
2828
// CHECK-NEXT: call_memcpy
2929
// CHECK-NEXT: test_function {{.*}}dll_intercept_memcpy_indirect.cpp:[[@LINE-5]]
3030
// CHECK: Address [[ADDR]] is located in stack of thread T0 at offset {{.*}} in frame

compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ int main() {
2222
call_memcpy(&memcpy, buff2, buff1, 6);
2323
// CHECK: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
2424
// CHECK: WRITE of size 6 at [[ADDR]] thread T0
25-
// CHECK-NEXT: __asan_{{.*}}mem{{.*}}
25+
// CHECK-NEXT: mem{{.*}}
2626
// CHECK-NEXT: call_mem{{.*}}
2727
// CHECK-NEXT: main {{.*}}intercept_memcpy.cpp:[[@LINE-5]]
2828
// CHECK: Address [[ADDR]] is located in stack of thread T0 at offset {{.*}} in frame

compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ int main() {
2323
//
2424
// The first frame is our wrapper normally but will be malloc in the dynamic
2525
// config.
26-
// CHECK: #0 {{.*}} in {{malloc|__asan_wrap_strdup}}
26+
// CHECK: #0 {{.*}} in {{malloc|strdup}}
2727
//
2828
// The local call to _strdup above may be the second or third frame depending
2929
// on whether we're using the dynamic config.

0 commit comments

Comments
 (0)