Hi,
On 04/05/2022 09:59, Martin Liška wrote:
> 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.
I noticed the above test (large-aligned-1.c) failing on the GCC 12
branch due to the change in output format mentioned above. This patch
(committed as r13-100-g3771486daa1e904ceae6f3e135b28e58af33849f) seems
to apply cleanly on the GCC 12 branch too, is it OK to backport to GCC 12?
Thanks,
Alex
> * c-c++-common/hwasan/stack-tagging-basic-1.c: Likewise.
> ---
> 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\]*.*" } */
> --
> 2.36.0
>
