From: Martin Liska Date: Sun, 30 Apr 2023 19:39:19 +0000 (+0200) Subject: hwasan: adjust wording in expected output in tests X-Git-Tag: basepoints/gcc-15~9779 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84e7d62c3bccb5e5ff9c37353b026f48e1148450;p=thirdparty%2Fgcc.git hwasan: adjust wording in expected output in tests gcc/testsuite/ChangeLog: * c-c++-common/hwasan/asan-pr70541.c: Adjust wording of expected output. * c-c++-common/hwasan/heap-overflow.c: Likewise. * c-c++-common/hwasan/sanity-check-pure-c.c: Likewise. * c-c++-common/hwasan/use-after-free.c: Likewise. --- diff --git a/gcc/testsuite/c-c++-common/hwasan/asan-pr70541.c b/gcc/testsuite/c-c++-common/hwasan/asan-pr70541.c index ba2ed496e6ee..be534dfd2319 100644 --- a/gcc/testsuite/c-c++-common/hwasan/asan-pr70541.c +++ b/gcc/testsuite/c-c++-common/hwasan/asan-pr70541.c @@ -33,4 +33,4 @@ int main() { /* { dg-output "HWAddressSanitizer: tag-mismatch on address 0x\[0-9a-f\]*.*" } */ /* { dg-output "READ of size 4 at 0x\[0-9a-f\]* tags: \[\[:xdigit:\]\]\[\[:xdigit:\]\]/\[\[:xdigit:\]\]\[\[:xdigit:\]\] \\(ptr/mem\\) in thread T0.*" } */ /* { dg-output "freed by thread T0 here:.*" } */ -/* { dg-output "previously allocated here:" } */ +/* { dg-output "previously allocated by thread T0 here:" } */ diff --git a/gcc/testsuite/c-c++-common/hwasan/heap-overflow.c b/gcc/testsuite/c-c++-common/hwasan/heap-overflow.c index a5a377159254..e424d8bcb124 100644 --- a/gcc/testsuite/c-c++-common/hwasan/heap-overflow.c +++ b/gcc/testsuite/c-c++-common/hwasan/heap-overflow.c @@ -24,6 +24,6 @@ int main(int argc, char **argv) { /* { dg-output "HWAddressSanitizer: tag-mismatch on address 0x\[0-9a-f\]*.*" } */ /* { dg-output "READ of size 1 at 0x\[0-9a-f\]* tags: \[\[:xdigit:\]\]\[\[:xdigit:\]\]/\[\[:xdigit:\]\]\[\[:xdigit:\]\].* \\(ptr/mem\\) in thread T0.*" } */ -/* { dg-output "located 0 bytes after 10-byte region.*" } */ -/* { dg-output "allocated here:.*" } */ +/* { dg-output "located 0 bytes after a 10-byte region.*" } */ +/* { dg-output "allocated by thread T0 here:.*" } */ /* { dg-output "#1 0x\[0-9a-f\]+ +in _*main \[^\n\r]*heap-overflow.c:18" } */ diff --git a/gcc/testsuite/c-c++-common/hwasan/sanity-check-pure-c.c b/gcc/testsuite/c-c++-common/hwasan/sanity-check-pure-c.c index a42921bb44cf..4e5570004589 100644 --- a/gcc/testsuite/c-c++-common/hwasan/sanity-check-pure-c.c +++ b/gcc/testsuite/c-c++-common/hwasan/sanity-check-pure-c.c @@ -20,6 +20,6 @@ int main() { /* { dg-output "HWAddressSanitizer: tag-mismatch on address 0x\[0-9a-f\]*.*" } */ /* { dg-output "READ of size 1 at 0x\[0-9a-f\]* tags: \[\[:xdigit:\]\]\[\[:xdigit:\]\]/\[\[:xdigit:\]\]\[\[:xdigit:\]\] \\(ptr/mem\\) in thread T0.*" } */ -/* { dg-output "located 5 bytes inside of 10-byte region.*" } */ +/* { dg-output "located 5 bytes inside a 10-byte region.*" } */ /* { dg-output "freed by thread T0 here:.*" } */ -/* { dg-output "previously allocated here:" } */ +/* { dg-output "previously allocated by thread T0 here:" } */ diff --git a/gcc/testsuite/c-c++-common/hwasan/use-after-free.c b/gcc/testsuite/c-c++-common/hwasan/use-after-free.c index 41a356999aad..b058982935fa 100644 --- a/gcc/testsuite/c-c++-common/hwasan/use-after-free.c +++ b/gcc/testsuite/c-c++-common/hwasan/use-after-free.c @@ -21,8 +21,8 @@ int main() { /* { dg-output "HWAddressSanitizer: tag-mismatch on address 0x\[0-9a-f\]*.*" } */ /* { dg-output "READ of size 1 at 0x\[0-9a-f\]* tags: \[\[:xdigit:\]\]\[\[:xdigit:\]\]/\[\[:xdigit:\]\]\[\[:xdigit:\]\] \\(ptr/mem\\) in thread T0.*" } */ -/* { dg-output "is located 5 bytes inside of 10-byte region.*" } */ +/* { dg-output "is located 5 bytes inside a 10-byte region.*" } */ /* { dg-output "freed by thread T0 here:.*" } */ /* { dg-output "#1\[^\n\r]*main\[^\n\r]*use-after-free.c:17.*" } */ -/* { dg-output "previously allocated here:.*" } */ +/* { dg-output "previously allocated by thread T0 here:.*" } */ /* { dg-output "#1\[^\n\r]*main\[^\n\r]*use-after-free.c:16" } */