From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id A0D033857366; Wed, 4 May 2022 08:00:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A0D033857366 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-100] hwasan: support new dg-output format. X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: 1ba68f78c9d2510eb095f7d8a90c87cd5fd4183d X-Git-Newrev: 3771486daa1e904ceae6f3e135b28e58af33849f Message-Id: <20220504080007.A0D033857366@sourceware.org> Date: Wed, 4 May 2022 08:00:07 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 May 2022 08:00:07 -0000 https://gcc.gnu.org/g:3771486daa1e904ceae6f3e135b28e58af33849f commit r13-100-g3771486daa1e904ceae6f3e135b28e58af33849f Author: Martin Liska Date: Wed May 4 09:57:17 2022 +0200 hwasan: support new dg-output format. Supports change in libsanitizer where it newly reports: READ of size 4 at 0xffffffffc3d4 tags: 02/01(00) (ptr/mem) in thread T0 So the 'tags' contains now 3 entries compared to 2 entries. gcc/testsuite/ChangeLog: * c-c++-common/hwasan/alloca-outside-caught.c: Update dg-output. * c-c++-common/hwasan/heap-overflow.c: Likewise. * c-c++-common/hwasan/hwasan-thread-access-parent.c: Likewise. * c-c++-common/hwasan/large-aligned-1.c: Likewise. * c-c++-common/hwasan/stack-tagging-basic-1.c: Likewise. Diff: --- gcc/testsuite/c-c++-common/hwasan/alloca-outside-caught.c | 2 +- gcc/testsuite/c-c++-common/hwasan/heap-overflow.c | 2 +- gcc/testsuite/c-c++-common/hwasan/hwasan-thread-access-parent.c | 2 +- gcc/testsuite/c-c++-common/hwasan/large-aligned-1.c | 2 +- gcc/testsuite/c-c++-common/hwasan/stack-tagging-basic-1.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/c-c++-common/hwasan/alloca-outside-caught.c b/gcc/testsuite/c-c++-common/hwasan/alloca-outside-caught.c index 60d7a9a874f..6f3825bee7c 100644 --- a/gcc/testsuite/c-c++-common/hwasan/alloca-outside-caught.c +++ b/gcc/testsuite/c-c++-common/hwasan/alloca-outside-caught.c @@ -20,6 +20,6 @@ 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:\]\]/00 \\(ptr/mem\\) in thread T0.*" } */ +/* { dg-output "READ of size 4 at 0x\[0-9a-f\]* tags: \[\[:xdigit:\]\]\[\[:xdigit:\]\]/00.* \\(ptr/mem\\) in thread T0.*" } */ /* { dg-output "Address 0x\[0-9a-f\]* is located in stack of thread T0.*" } */ /* { dg-output "SUMMARY: HWAddressSanitizer: tag-mismatch \[^\n\]*.*" } */ diff --git a/gcc/testsuite/c-c++-common/hwasan/heap-overflow.c b/gcc/testsuite/c-c++-common/hwasan/heap-overflow.c index 137466800de..bddb38c81f1 100644 --- a/gcc/testsuite/c-c++-common/hwasan/heap-overflow.c +++ b/gcc/testsuite/c-c++-common/hwasan/heap-overflow.c @@ -23,7 +23,7 @@ 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 "READ of size 1 at 0x\[0-9a-f\]* tags: \[\[:xdigit:\]\]\[\[:xdigit:\]\]/\[\[:xdigit:\]\]\[\[:xdigit:\]\].* \\(ptr/mem\\) in thread T0.*" } */ /* { dg-output "located 0 bytes to the right of 10-byte region.*" } */ /* { dg-output "allocated 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/hwasan-thread-access-parent.c b/gcc/testsuite/c-c++-common/hwasan/hwasan-thread-access-parent.c index 828909d3b3b..eca27c8cd2c 100644 --- a/gcc/testsuite/c-c++-common/hwasan/hwasan-thread-access-parent.c +++ b/gcc/testsuite/c-c++-common/hwasan/hwasan-thread-access-parent.c @@ -46,6 +46,6 @@ main (int argc, char **argv) } /* { dg-output "HWAddressSanitizer: tag-mismatch on address 0x\[0-9a-f\]*.*" } */ -/* { dg-output "READ of size 4 at 0x\[0-9a-f\]* tags: 00/\[\[:xdigit:\]\]\[\[:xdigit:\]\] \\(ptr/mem\\) in thread T1.*" } */ +/* { dg-output "READ of size 4 at 0x\[0-9a-f\]* tags: 00/\[\[:xdigit:\]\]\[\[:xdigit:\]\].* \\(ptr/mem\\) in thread T1.*" } */ /* { dg-output "Address 0x\[0-9a-f\]* is located in stack of thread T0.*" } */ /* { dg-output "SUMMARY: HWAddressSanitizer: tag-mismatch \[^\n\]*.*" } */ diff --git a/gcc/testsuite/c-c++-common/hwasan/large-aligned-1.c b/gcc/testsuite/c-c++-common/hwasan/large-aligned-1.c index 1aa13032396..6158ba4bdbc 100644 --- a/gcc/testsuite/c-c++-common/hwasan/large-aligned-1.c +++ b/gcc/testsuite/c-c++-common/hwasan/large-aligned-1.c @@ -9,6 +9,6 @@ /* { dg-output "HWAddressSanitizer: tag-mismatch on address 0x\[0-9a-f\]*.*" } */ /* NOTE: This assumes the current tagging mechanism (one at a time from the base and large aligned variables being handled first). */ -/* { dg-output "READ of size 4 at 0x\[0-9a-f\]* tags: \[\[:xdigit:\]\]\[\[:xdigit:\]\]/\[\[:xdigit:\]\]\[\[:xdigit:\]\] \\(ptr/mem\\) in thread T0.*" } */ +/* { dg-output "READ of size 4 at 0x\[0-9a-f\]* tags: \[\[:xdigit:\]\]\[\[:xdigit:\]\]/\[\[:xdigit:\]\]\[\[:xdigit:\]\].* \\(ptr/mem\\) in thread T0.*" } */ /* { dg-output "Address 0x\[0-9a-f\]* is located in stack of thread T0.*" } */ /* { dg-output "SUMMARY: HWAddressSanitizer: tag-mismatch \[^\n\]*.*" } */ diff --git a/gcc/testsuite/c-c++-common/hwasan/stack-tagging-basic-1.c b/gcc/testsuite/c-c++-common/hwasan/stack-tagging-basic-1.c index 90d5837254f..c4e698e1b8b 100644 --- a/gcc/testsuite/c-c++-common/hwasan/stack-tagging-basic-1.c +++ b/gcc/testsuite/c-c++-common/hwasan/stack-tagging-basic-1.c @@ -13,6 +13,6 @@ #undef ARG /* { 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 "READ of size 4 at 0x\[0-9a-f\]* tags: \[\[:xdigit:\]\]\[\[:xdigit:\]\]/\[\[:xdigit:\]\]\[\[:xdigit:\]\].* \\(ptr/mem\\) in thread T0.*" } */ /* { dg-output "Address 0x\[0-9a-f\]* is located in stack of thread T0.*" } */ /* { dg-output "SUMMARY: HWAddressSanitizer: tag-mismatch \[^\n\]*.*" } */