Attached patch OK?
Copy/pasted for review convenience.
diff --git a/gcc/testsuite/c-c++-common/Wrestrict.c
b/gcc/testsuite/c-c++-common/Wrestrict.c
index 4d005a618b3..57a3f67e21e 100644
--- a/gcc/testsuite/c-c++-common/Wrestrict.c
+++ b/gcc/testsuite/c-c++-common/Wrestrict.c
@@ -381,14 +381,14 @@ void test_memcpy_range_exceed (char *d, const char *s)
T (d + i, s + 1, 3); /* { dg-warning "accessing 3 bytes at offsets \\\[\[0-9\]+,
\[0-9\]+] and 1 overlaps 1 byte" "memcpy" } */
#if __SIZEOF_SIZE_T__ == 8
- /* Verfiy the offset and size computation is correct. The overlap
- offset mentioned in the warning plus sthe size of the access must
+ /* Verify the offset and size computation is correct. The overlap
+ offset mentioned in the warning plus the size of the access must
not exceed DIFF_MAX. */
- T (d, d + i, 5); /* { dg-warning "accessing 5 bytes at offsets 0 and
\\\[9223372036854775805, 9223372036854775807] overlaps 3 bytes at offset 9223372036854775802"
"LP64" { target lp64 } } */
- T (d + i, d, 5); /* { dg-warning "accessing 5 bytes at offsets \\\[9223372036854775805,
9223372036854775807] and 0 overlaps 3 bytes at offset 9223372036854775802" "LP64" {
target lp64 } } */
+ T (d, d + i, 5); /* { dg-warning "accessing 5 bytes at offsets 0 and
\\\[9223372036854775805, 9223372036854775807] overlaps 3 bytes at offset 9223372036854775802"
"LP64" { target { lp64 || llp64 } } } */
+ T (d + i, d, 5); /* { dg-warning "accessing 5 bytes at offsets \\\[9223372036854775805,
9223372036854775807] and 0 overlaps 3 bytes at offset 9223372036854775802" "LP64" {
target { lp64 || llp64 } } } */
- T (d, s + i, 5); /* { dg-warning "accessing 5 bytes at offsets 0 and \\\[9223372036854775805, 9223372036854775807] overlaps 3 bytes at offset 9223372036854775802" "LP64" { target lp64 } } */
- T (d + i, s, 5); /* { dg-warning "accessing 5 bytes at offsets \\\[9223372036854775805,
9223372036854775807] and 0 overlaps 3 bytes at offset 9223372036854775802" "LP64" {
target lp64 } } */
+ T (d, s + i, 5); /* { dg-warning "accessing 5 bytes at offsets 0 and
\\\[9223372036854775805, 9223372036854775807] overlaps 3 bytes at offset 9223372036854775802"
"LP64" { target { lp64 || llp64 } } } */
+ T (d + i, s, 5); /* { dg-warning "accessing 5 bytes at offsets \\\[9223372036854775805,
9223372036854775807] and 0 overlaps 3 bytes at offset 9223372036854775802" "LP64" {
target { lp64 || llp64 } } } */
#elif __SIZEOF_SIZE_T__ == 4
T (d, d + i, 5); /* { dg-warning "accessing 5 bytes at offsets 0 and \\\[2147483645,
2147483647] overlaps 3 bytes at offset 2147483642" "ILP32" { target ilp32 } } */
T (d + i, d, 5); /* { dg-warning "accessing 5 bytes at offsets \\\[2147483645,
2147483647] and 0 overlaps 3 bytes at offset 2147483642" "ILP32" { target ilp32 } }
*/From 57b2310756b5d0de99fbdbf7b0b11f01fe66be11 Mon Sep 17 00:00:00 2001
From: Jonathan Yong <10wa...@gmail.com>
Date: Sun, 11 Feb 2024 09:25:25 +0000
Subject: [PATCH] c-c++-common/Wrestrict.c: fix some typos and enable for LLP64
Signed-off-by: Jonathan Yong <10wa...@gmail.com>
gcc/testsuite:
* c-c++-common/Wrestrict.c: Fix typos in comments and
enable for LLP64 testing.
---
gcc/testsuite/c-c++-common/Wrestrict.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gcc/testsuite/c-c++-common/Wrestrict.c b/gcc/testsuite/c-c++-common/Wrestrict.c
index 4d005a618b3..57a3f67e21e 100644
--- a/gcc/testsuite/c-c++-common/Wrestrict.c
+++ b/gcc/testsuite/c-c++-common/Wrestrict.c
@@ -381,14 +381,14 @@ void test_memcpy_range_exceed (char *d, const char *s)
T (d + i, s + 1, 3); /* { dg-warning "accessing 3 bytes at offsets \\\[\[0-9\]+, \[0-9\]+] and 1 overlaps 1 byte" "memcpy" } */
#if __SIZEOF_SIZE_T__ == 8
- /* Verfiy the offset and size computation is correct. The overlap
- offset mentioned in the warning plus sthe size of the access must
+ /* Verify the offset and size computation is correct. The overlap
+ offset mentioned in the warning plus the size of the access must
not exceed DIFF_MAX. */
- T (d, d + i, 5); /* { dg-warning "accessing 5 bytes at offsets 0 and \\\[9223372036854775805, 9223372036854775807] overlaps 3 bytes at offset 9223372036854775802" "LP64" { target lp64 } } */
- T (d + i, d, 5); /* { dg-warning "accessing 5 bytes at offsets \\\[9223372036854775805, 9223372036854775807] and 0 overlaps 3 bytes at offset 9223372036854775802" "LP64" { target lp64 } } */
+ T (d, d + i, 5); /* { dg-warning "accessing 5 bytes at offsets 0 and \\\[9223372036854775805, 9223372036854775807] overlaps 3 bytes at offset 9223372036854775802" "LP64" { target { lp64 || llp64 } } } */
+ T (d + i, d, 5); /* { dg-warning "accessing 5 bytes at offsets \\\[9223372036854775805, 9223372036854775807] and 0 overlaps 3 bytes at offset 9223372036854775802" "LP64" { target { lp64 || llp64 } } } */
- T (d, s + i, 5); /* { dg-warning "accessing 5 bytes at offsets 0 and \\\[9223372036854775805, 9223372036854775807] overlaps 3 bytes at offset 9223372036854775802" "LP64" { target lp64 } } */
- T (d + i, s, 5); /* { dg-warning "accessing 5 bytes at offsets \\\[9223372036854775805, 9223372036854775807] and 0 overlaps 3 bytes at offset 9223372036854775802" "LP64" { target lp64 } } */
+ T (d, s + i, 5); /* { dg-warning "accessing 5 bytes at offsets 0 and \\\[9223372036854775805, 9223372036854775807] overlaps 3 bytes at offset 9223372036854775802" "LP64" { target { lp64 || llp64 } } } */
+ T (d + i, s, 5); /* { dg-warning "accessing 5 bytes at offsets \\\[9223372036854775805, 9223372036854775807] and 0 overlaps 3 bytes at offset 9223372036854775802" "LP64" { target { lp64 || llp64 } } } */
#elif __SIZEOF_SIZE_T__ == 4
T (d, d + i, 5); /* { dg-warning "accessing 5 bytes at offsets 0 and \\\[2147483645, 2147483647] overlaps 3 bytes at offset 2147483642" "ILP32" { target ilp32 } } */
T (d + i, d, 5); /* { dg-warning "accessing 5 bytes at offsets \\\[2147483645, 2147483647] and 0 overlaps 3 bytes at offset 2147483642" "ILP32" { target ilp32 } } */
--
2.43.1
