Skip to content

Commit 304e76e

Browse files
committed
Darwin: tolerate reordering using DAG group
1 parent 373cca4 commit 304e76e

File tree

4 files changed

+16
-17
lines changed

4 files changed

+16
-17
lines changed

compiler-rt/test/asan/TestCases/wcscat.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ int main() {
1616
wchar_t badDst[9];
1717
wcscpy(badDst, start);
1818
fprintf(stderr, "Good so far.\n");
19-
// CHECK: Good so far.
19+
// CHECK-DAG: Good so far.
2020
fflush(stderr);
2121
wcscat(badDst, append); // Boom!
22-
// CHECK: ERROR: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]] at pc {{0x[0-9a-f]+}} bp {{0x[0-9a-f]+}} sp {{0x[0-9a-f]+}}
23-
// CHECK: WRITE of size {{[0-9]+}} at [[ADDR]] thread T0
24-
// CHECK: #0 {{0x[0-9a-f]+}} in wcscat
22+
// CHECK-DAG: ERROR: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]] at pc {{0x[0-9a-f]+}} bp {{0x[0-9a-f]+}} sp {{0x[0-9a-f]+}}
23+
// CHECK-DAG: WRITE of size {{[0-9]+}} at [[ADDR]] thread T0
24+
// CHECK-DAG: #0 {{0x[0-9a-f]+}} in wcscat
2525
printf("Should have failed with ASAN error.\n");
2626
}

compiler-rt/test/asan/TestCases/wcscpy.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ int main() {
1313

1414
wchar_t badDst[7];
1515
fprintf(stderr, "Good so far.\n");
16-
// CHECK: Good so far.
16+
// CHECK-DAG: Good so far.
1717
fflush(stderr);
1818
wcscpy(badDst, src); // Boom!
19-
// CHECK: ERROR: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]] at pc {{0x[0-9a-f]+}} bp {{0x[0-9a-f]+}} sp {{0x[0-9a-f]+}}
20-
// CHECK: WRITE of size {{[0-9]+}} at [[ADDR]] thread T0
21-
// CHECK: #0 {{0x[0-9a-f]+}} in wcscpy
19+
// CHECK-DAG: ERROR: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]] at pc {{0x[0-9a-f]+}} bp {{0x[0-9a-f]+}} sp {{0x[0-9a-f]+}}
20+
// CHECK-DAG: WRITE of size {{[0-9]+}} at [[ADDR]] thread T0
21+
// CHECK-DAG: #0 {{0x[0-9a-f]+}} in wcscpy
2222
printf("Should have failed with ASAN error.\n");
2323
}

compiler-rt/test/asan/TestCases/wcsncat.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ int main() {
1717
wcscpy(badDst, start);
1818
wcsncat(badDst, append, 1);
1919
fprintf(stderr, "Good so far.\n");
20-
// CHECK: Good so far.
20+
// CHECK-DAG: Good so far.
2121
fflush(stderr);
2222
wcsncat(badDst, append, 3); // Boom!
23-
// CHECK: ERROR: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]] at pc {{0x[0-9a-f]+}} bp {{0x[0-9a-f]+}} sp {{0x[0-9a-f]+}}
24-
// CHECK: WRITE of size {{[0-9]+}} at [[ADDR]] thread T0
25-
// CHECK: #0 {{0x[0-9a-f]+}} in wcsncat
23+
// CHECK-DAG: ERROR: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]] at pc {{0x[0-9a-f]+}} bp {{0x[0-9a-f]+}} sp {{0x[0-9a-f]+}}
24+
// CHECK-DAG: WRITE of size {{[0-9]+}} at [[ADDR]] thread T0
25+
// CHECK-DAG: #0 {{0x[0-9a-f]+}} in wcsncat
2626
printf("Should have failed with ASAN error.\n");
2727
}

compiler-rt/test/asan/TestCases/wcsncpy.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ int main() {
1414
wchar_t badDst[7];
1515
wcsncpy(badDst, src, 7); // This should still work.
1616
fprintf(stderr, "Good so far.\n");
17-
// CHECK: Good so far.
17+
// CHECK-DAG: Good so far.
1818
fflush(stderr);
19-
2019
wcsncpy(badDst, src, 15); // Boom!
21-
// CHECK: ERROR: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]] at pc {{0x[0-9a-f]+}} bp {{0x[0-9a-f]+}} sp {{0x[0-9a-f]+}}
22-
// CHECK: WRITE of size {{[0-9]+}} at [[ADDR]] thread T0
23-
// CHECK: #0 {{0x[0-9a-f]+}} in wcsncpy
20+
// CHECK-DAG: ERROR: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]] at pc {{0x[0-9a-f]+}} bp {{0x[0-9a-f]+}} sp {{0x[0-9a-f]+}}
21+
// CHECK-DAG: WRITE of size {{[0-9]+}} at [[ADDR]] thread T0
22+
// CHECK-DAG: #0 {{0x[0-9a-f]+}} in wcsncpy
2423
printf("Should have failed with ASAN error.\n");
2524
}

0 commit comments

Comments
 (0)