From 66dcb747e8ba1f0ed6e0d49ed3d842b3e091609d Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 28 Feb 2019 08:17:49 +0100 Subject: [PATCH] re PR c/89525 (inform messages from -Wbuiltin-declaration-mismatch even with -w) PR c/89525 * c-typeck.c (convert_arguments): Call inform_declaration only if the previous warning_at call returned true. * gcc.dg/pr89525.c: New test. From-SVN: r269274 --- gcc/c/ChangeLog | 6 ++++++ gcc/c/c-typeck.c | 18 ++++++++---------- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/gcc.dg/pr89525.c | 11 +++++++++++ 4 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr89525.c diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 6b26ca0f9b3..ec60ed3b81a 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,9 @@ +2019-02-28 Jakub Jelinek + + PR c/89525 + * c-typeck.c (convert_arguments): Call inform_declaration only if + the previous warning_at call returned true. + 2019-02-22 Thomas Schwinge * c-parser.c (c_parser_oacc_shape_clause): Add loc formal diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 48112006f04..2de4d0f85fd 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -3509,12 +3509,10 @@ convert_arguments (location_t loc, vec arg_loc, tree typelist, if (builtin_type == void_type_node) { - warning_at (loc, OPT_Wbuiltin_declaration_mismatch, - "too many arguments to built-in function %qE " - "expecting %d", - function, parmnum); - - inform_declaration (fundecl); + if (warning_at (loc, OPT_Wbuiltin_declaration_mismatch, + "too many arguments to built-in function %qE " + "expecting %d", function, parmnum)) + inform_declaration (fundecl); builtin_typetail = NULL_TREE; } @@ -3651,10 +3649,10 @@ convert_arguments (location_t loc, vec arg_loc, tree typelist, for (tree t = builtin_typetail; t; t = TREE_CHAIN (t)) ++nargs; - warning_at (loc, OPT_Wbuiltin_declaration_mismatch, - "too few arguments to built-in function %qE expecting %u", - function, nargs - 1); - inform_declaration (fundecl); + if (warning_at (loc, OPT_Wbuiltin_declaration_mismatch, + "too few arguments to built-in function %qE " + "expecting %u", function, nargs - 1)) + inform_declaration (fundecl); } return error_args ? -1 : (int) parmnum; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 21642dec1c1..c711829816e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2019-02-28 Jakub Jelinek + PR c/89525 + * gcc.dg/pr89525.c: New test. + PR c/89520 * gcc.dg/pr89520-1.c: New test. * gcc.dg/pr89520-2.c: New test. diff --git a/gcc/testsuite/gcc.dg/pr89525.c b/gcc/testsuite/gcc.dg/pr89525.c new file mode 100644 index 00000000000..099e174875c --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr89525.c @@ -0,0 +1,11 @@ +/* PR c/89525 */ +/* { dg-do compile } */ +/* { dg-options "-w" } */ + +double sqrt (); /* { dg-bogus "declared here" } */ + +void +foo (void) +{ + sqrt (); +}