On Wed, 2020-01-08 at 12:52 +0100, Andreas Schwab wrote: > On Dez 06 2019, Martin Sebor wrote: > > > diff --git a/gcc/testsuite/gcc.dg/Wstringop-overflow-27.c > > b/gcc/testsuite/gcc.dg/Wstringop-overflow-27.c > > new file mode 100644 > > index 00000000000..249ce2b6ad5 > > --- /dev/null > > +++ b/gcc/testsuite/gcc.dg/Wstringop-overflow-27.c > > +void test_strcpy_warn (const char *s) > > +{ > > + { > > + const char a[] = "123"; > > + /* Verify that using signed int for the strlen result works (i.e., > > + that the conversion from signed int to size_t doesn't prevent > > + the detection. */ > > + int n = strlen (a); > > + char *t = (char*)calloc (n, 1); // { dg-message "at offset 0 to an > > object with size 3 allocated by 'calloc' here" "calloc note" { xfail *-*-* > > } } > > + // { dg-message "at offset 0 to an > > object with size at most 3 allocated by 'calloc' here" "calloc note" { > > target *-*-* } .-1 } > > Please make the test name unique. > > > + strcpy (t, a); // { dg-warning "writing 4 bytes > > into a region of size (between 0 and )?3 " } > > + > > + sink (t); > > + } > > + > > + { > > + const char a[] = "1234"; > > + size_t n = strlen (a); > > + char *t = (char*)malloc (n); // { dg-message "at offset 0 to an > > object with size 4 allocated by 'malloc' here" "malloc note" { xfail *-*-* > > } } > > + // { dg-message "at offset 0 to an > > object with size at most 4 allocated by 'malloc' here" "malloc note" { > > target *-*-* } .-1 } > > Likewise. Fixed via the attached patch which I've committed to the trunk.
jeff
commit 48e76be17adbf93fe264fc118adbcf2ae6a14806 Author: law <law@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Wed Jan 8 18:46:33 2020 +0000 * gcc.dg/Wstringop-overflow-27.c: Make testnames unique. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@280016 138bc75d-0d04-0410-961f-82ee72b054a4 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 537091ffec6..622589e3db6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2020-01-08 Jeff Law <l...@redhat.com> + + * gcc.dg/Wstringop-overflow-27.c: Make testnames unique. + 2020-01-08 Joel Brobecker <brobec...@adacore.com> Olivier Hainque <hain...@adacore.com> diff --git a/gcc/testsuite/gcc.dg/Wstringop-overflow-27.c b/gcc/testsuite/gcc.dg/Wstringop-overflow-27.c index 249ce2b6ad5..8e2cfe30725 100644 --- a/gcc/testsuite/gcc.dg/Wstringop-overflow-27.c +++ b/gcc/testsuite/gcc.dg/Wstringop-overflow-27.c @@ -260,8 +260,8 @@ void test_strcpy_warn (const char *s) that the conversion from signed int to size_t doesn't prevent the detection. */ int n = strlen (a); - char *t = (char*)calloc (n, 1); // { dg-message "at offset 0 to an object with size 3 allocated by 'calloc' here" "calloc note" { xfail *-*-* } } - // { dg-message "at offset 0 to an object with size at most 3 allocated by 'calloc' here" "calloc note" { target *-*-* } .-1 } + char *t = (char*)calloc (n, 1); // { dg-message "at offset 0 to an object with size 3 allocated by 'calloc' here" "calloc note 1" { xfail *-*-* } } + // { dg-message "at offset 0 to an object with size at most 3 allocated by 'calloc' here" "calloc note 2" { target *-*-* } .-1 } strcpy (t, a); // { dg-warning "writing 4 bytes into a region of size (between 0 and )?3 " } sink (t); @@ -270,8 +270,8 @@ void test_strcpy_warn (const char *s) { const char a[] = "1234"; size_t n = strlen (a); - char *t = (char*)malloc (n); // { dg-message "at offset 0 to an object with size 4 allocated by 'malloc' here" "malloc note" { xfail *-*-* } } - // { dg-message "at offset 0 to an object with size at most 4 allocated by 'malloc' here" "malloc note" { target *-*-* } .-1 } + char *t = (char*)malloc (n); // { dg-message "at offset 0 to an object with size 4 allocated by 'malloc' here" "malloc note 1" { xfail *-*-* } } + // { dg-message "at offset 0 to an object with size at most 4 allocated by 'malloc' here" "malloc note 2" { target *-*-* } .-1 } strcpy (t, a); // { dg-warning "writing 5 bytes into a region of size (between 0 and )?4 " } sink (t); }