Skip to content
This repository was archived by the owner on Apr 23, 2020. It is now read-only.

Commit 57f74a9

Browse files
committed
[asan] Relax a flaky invalid-pointer-pairs test
This test is flaky. Specifically, on some Mac configurations we see the __sanitizer_ptr_cmp as the 0th frame. Let's relax it to not require that f is in frame #0. 61396==ERROR: AddressSanitizer: invalid-pointer-pair: 0x01e00510 0x01e004d0 0 0x18f5a3 in __sanitizer_ptr_cmp ... libclang_rt.asan_osx_dynamic.dylib+0xaf5a3) 1 0xdd924 in f(char, char*, char*) ... invalid-pointer-pairs.cc:14:14 Differential Revision: http://reviews.llvm.org/D21588 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@273475 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 19c4576 commit 57f74a9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

test/asan/TestCases/invalid-pointer-pairs.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ int f(char c, char *p, char *q) {
1313
// [[PTR1:0x[0-9a-f]+]] [[PTR2:0x[0-9a-f]+]]
1414
switch (c) {
1515
case 'g':
16-
// CMP: #0 {{.*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+1]]:14
16+
// CMP: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+1]]:14
1717
return p > q;
1818
case 's':
19-
// SUB: #0 {{.*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+1]]:14
19+
// SUB: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+1]]:14
2020
return p - q;
2121
case 'k': {
2222
// OK-NOT: ERROR
@@ -26,7 +26,7 @@ int f(char c, char *p, char *q) {
2626
case 'f': {
2727
char *p3 = p + 20;
2828
free(p);
29-
// FREE: #0 {{.*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+2]]:14
29+
// FREE: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+2]]:14
3030
// FREE: freed by thread
3131
return p < p3;
3232
}

0 commit comments

Comments
 (0)