[compiler-rt] r282859 - [compiler-rt][asan] Fix incorrect regexp breaking an asan unittest on win64

Etienne Bergeron via llvm-commits llvm-commits at lists.llvm.org
Fri Sep 30 07:29:43 PDT 2016


Author: etienneb
Date: Fri Sep 30 09:29:43 2016
New Revision: 282859

URL: http://llvm.org/viewvc/llvm-project?rev=282859&view=rev
Log:
[compiler-rt][asan] Fix incorrect regexp breaking an asan unittest on win64

Summary:
On windows, the memcpy and memmove function can be the same.
This is correcly detected when hooking, but it's not possible
to report the right function name when doing symbolisation.

The same fix was applied for the static asan unittest.
We forgot to apply the fix for the dynamic asan tests.
```
lvm\projects\compiler-rt\test\asan/TestCases/Windows/.svn/text-base/intercept_memcpy.cc.svn-base:// CHECK-NEXT:  __asan_{{.*}}mem{{.*}}
```

This patch is fixing this test (win64):
```
ddressSanitizer-x86_64-windows-dynamic :: TestCases/Windows/dll_intercept_memcpy_indirect.cc
```

Reviewers: rnk, vitalybuka

Subscribers: llvm-commits, kubabrecka, chrisha, dberris

Differential Revision: https://reviews.llvm.org/D25038

Modified:
    compiler-rt/trunk/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cc

Modified: compiler-rt/trunk/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cc?rev=282859&r1=282858&r2=282859&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cc Fri Sep 30 09:29:43 2016
@@ -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_{{.*}}memcpy
+// CHECK-NEXT:  __asan_{{.*}}mem{{.*}}
 // CHECK-NEXT:  call_memcpy
 // CHECK-NEXT:  test_function {{.*}}dll_intercept_memcpy_indirect.cc:[[@LINE-5]]
 // CHECK: Address [[ADDR]] is located in stack of thread T0 at offset {{.*}} in frame




More information about the llvm-commits mailing list