PR c/80619 - bad fix-it hint for GCC %lu directive with int argument: %wu

gcc/c-family/ChangeLog:

	PR c/80619
	* c-format.c (printf_length_specs): Set FMT_LEN_w for "w".
	(asm_fprintf_length_spec): Same.
	* c-format.h (format_lengths): Add FMT_LEN_w.

gcc/testsuite/ChangeLog:

	PR c/80619
	* gcc.dg/format/pr80619.c: New test.

From-SVN: r274385
This commit is contained in:
Martin Sebor 2019-08-13 15:55:40 +00:00 committed by Martin Sebor
parent 547d5d22e9
commit 51ad8481b8
5 changed files with 104 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2019-08-13 Martin Sebor <msebor@redhat.com>
PR c/80619
* c-format.c (printf_length_specs): Set FMT_LEN_w for "w".
(asm_fprintf_length_spec): Same.
* c-format.h (format_lengths): Add FMT_LEN_w.
2019-08-10 Jakub Jelinek <jakub@redhat.com>
* c-pragma.h (enum pragma_omp_clause): Add

View File

@ -497,7 +497,7 @@ static const format_length_info printf_length_specs[] =
static const format_length_info asm_fprintf_length_specs[] =
{
{ "l", FMT_LEN_l, STD_C89, "ll", FMT_LEN_ll, STD_C89, 0 },
{ "w", FMT_LEN_none, STD_C89, NO_FMT, 0 },
{ "w", FMT_LEN_w, STD_C89, NO_FMT, 0 },
{ NO_FMT, NO_FMT, 0 }
};
@ -505,7 +505,7 @@ static const format_length_info asm_fprintf_length_specs[] =
static const format_length_info gcc_diag_length_specs[] =
{
{ "l", FMT_LEN_l, STD_C89, "ll", FMT_LEN_ll, STD_C89, 0 },
{ "w", FMT_LEN_none, STD_C89, NO_FMT, 0 },
{ "w", FMT_LEN_w, STD_C89, NO_FMT, 0 },
{ NO_FMT, NO_FMT, 0 }
};

View File

@ -36,6 +36,7 @@ enum format_lengths
FMT_LEN_H,
FMT_LEN_D,
FMT_LEN_DD,
FMT_LEN_w, /* GCC's HOST_WIDE_INT. */
FMT_LEN_MAX
};

View File

@ -1,3 +1,8 @@
2019-08-13 Martin Sebor <msebor@redhat.com>
PR c/80619
* gcc.dg/format/pr80619.c: New test.
2019-08-13 Marek Polacek <polacek@redhat.com>
PR c++/90473 - wrong code with nullptr in default argument.

View File

@ -0,0 +1,89 @@
/* PR c/80619 - bad fix-it hint for GCC %lu directive with int argument: %wu
{ dg-do compile }
{ dg-options "-Wall -fdiagnostics-show-caret" } */
void T (const char*, ...) __attribute__ ((format (__gcc_diag__, 1, 2)));
void test_suggested_modifier (void)
{
T ("%ld", 0); // { dg-warning "format '%ld' expects argument of type 'long int', but argument 2 has type 'int'" }
/* { dg-begin-multiline-output "" }
T ("%ld", 0);
~~^ ~
| |
| int
long int
%d
{ dg-end-multiline-output "" } */
T ("%li", 0); // { dg-warning "format '%li' expects argument of type 'long int', but argument 2 has type 'int'" }
/* { dg-begin-multiline-output "" }
T ("%li", 0);
~~^ ~
| |
| int
long int
%i
{ dg-end-multiline-output "" } */
T ("%lu", 0); // { dg-warning "format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'int'" }
/* { dg-begin-multiline-output "" }
T ("%lu", 0);
~~^ ~
| |
| int
long unsigned int
%u
{ dg-end-multiline-output "" } */
T ("%lx", 0); // { dg-warning "format '%lx' expects argument of type 'long unsigned int', but argument 2 has type 'int'" }
/* { dg-begin-multiline-output "" }
T ("%lx", 0);
~~^ ~
| |
| int
long unsigned int
%x
{ dg-end-multiline-output "" } */
T ("%lli", 0); // { dg-warning "format '%lli' expects argument of type 'long long int', but argument 2 has type 'int'" }
/* { dg-begin-multiline-output "" }
T ("%lli", 0);
~~~^ ~
| |
| int
long long int
%i
{ dg-end-multiline-output "" } */
T ("%llo", 0); // { dg-warning "format '%llo' expects argument of type 'long long unsigned int', but argument 2 has type 'int'" }
/* { dg-begin-multiline-output "" }
T ("%llo", 0);
~~~^ ~
| |
| int
long long unsigned int
%o
{ dg-end-multiline-output "" } */
T ("%llu", 0); // { dg-warning "format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'int'" }
/* { dg-begin-multiline-output "" }
T ("%llu", 0);
~~~^ ~
| |
| int
long long unsigned int
%u
{ dg-end-multiline-output "" } */
T ("%llx", 0); // { dg-warning "format '%llx' expects argument of type 'long long unsigned int', but argument 2 has type 'int'" }
/* { dg-begin-multiline-output "" }
T ("%llx", 0);
~~~^ ~
| |
| int
long long unsigned int
%x
{ dg-end-multiline-output "" } */
}