From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 557153858C5E; Fri, 10 Mar 2023 09:15:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 557153858C5E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678439755; bh=FWbK5ev9lYf4nswYTrdZUOzZfcNsvZwUCBcMO9Rf5NA=; h=From:To:Subject:Date:From; b=eSVrw0ZY+0TIqlulHDBLVF1loEXzOwiYDZjc/9uOi+WHqrGluqtXuTdD4e7vwmSQU IauCaD/9XymSs76FyiR5BJ8D3PI+wAwky5NUL6g5nzAEcOnC/jesWAlCrkvYEBFFgf TlTWZM/8d56QggOS9HWJsYwS9UU/6kia0tUGC47E= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6575] c, c++, cgraphunit: Prevent duplicated -Wunused-value warnings [PR108079] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: a1d5c729ceeb112af26e3298314a0de3058f1d82 X-Git-Newrev: 2c63cc7268fd5615997989f153e9405d0f5aaa50 Message-Id: <20230310091555.557153858C5E@sourceware.org> Date: Fri, 10 Mar 2023 09:15:55 +0000 (GMT) List-Id: https://gcc.gnu.org/g:2c63cc7268fd5615997989f153e9405d0f5aaa50 commit r13-6575-g2c63cc7268fd5615997989f153e9405d0f5aaa50 Author: Jakub Jelinek Date: Fri Mar 10 10:10:24 2023 +0100 c, c++, cgraphunit: Prevent duplicated -Wunused-value warnings [PR108079] On the following testcase, we warn with -Wunused-value twice, once in the FEs and later on cgraphunit again with slightly different wording. The following patch fixes that by registering a warning suppression in the FEs when we warn and not warning in cgraphunit anymore if that happened. 2023-03-10 Jakub Jelinek PR c/108079 gcc/ * cgraphunit.cc (check_global_declaration): Don't warn for unused variables which have OPT_Wunused_variable warning suppressed. gcc/c/ * c-decl.cc (pop_scope): Suppress OPT_Wunused_variable warning after diagnosing it. gcc/cp/ * decl.cc (poplevel): Suppress OPT_Wunused_variable warning after diagnosing it. gcc/testsuite/ * c-c++-common/Wunused-var-18.c: New test. Diff: --- gcc/c/c-decl.cc | 5 ++++- gcc/cgraphunit.cc | 1 + gcc/cp/decl.cc | 1 + gcc/testsuite/c-c++-common/Wunused-var-18.c | 10 ++++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc index 91599658be9..e537d33f398 100644 --- a/gcc/c/c-decl.cc +++ b/gcc/c/c-decl.cc @@ -1310,7 +1310,10 @@ pop_scope (void) && scope != external_scope) { if (!TREE_USED (p)) - warning (OPT_Wunused_variable, "unused variable %q+D", p); + { + warning (OPT_Wunused_variable, "unused variable %q+D", p); + suppress_warning (p, OPT_Wunused_variable); + } else if (DECL_CONTEXT (p) == current_function_decl) warning_at (DECL_SOURCE_LOCATION (p), OPT_Wunused_but_set_variable, diff --git a/gcc/cgraphunit.cc b/gcc/cgraphunit.cc index a972900900b..e12764f2f90 100644 --- a/gcc/cgraphunit.cc +++ b/gcc/cgraphunit.cc @@ -1120,6 +1120,7 @@ check_global_declaration (symtab_node *snode) && (TREE_CODE (decl) != FUNCTION_DECL || (!DECL_STATIC_CONSTRUCTOR (decl) && !DECL_STATIC_DESTRUCTOR (decl))) + && (! VAR_P (decl) || !warning_suppressed_p (decl, OPT_Wunused_variable)) /* Otherwise, ask the language. */ && lang_hooks.decls.warn_unused_global (decl)) warning_at (DECL_SOURCE_LOCATION (decl), diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index b1603859644..51199bb311a 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -693,6 +693,7 @@ poplevel (int keep, int reverse, int functionbody) else warning_at (DECL_SOURCE_LOCATION (decl), OPT_Wunused_variable, "unused variable %qD", decl); + suppress_warning (decl, OPT_Wunused_variable); } else if (DECL_CONTEXT (decl) == current_function_decl // For -Wunused-but-set-variable leave references alone. diff --git a/gcc/testsuite/c-c++-common/Wunused-var-18.c b/gcc/testsuite/c-c++-common/Wunused-var-18.c new file mode 100644 index 00000000000..5ff772b74c1 --- /dev/null +++ b/gcc/testsuite/c-c++-common/Wunused-var-18.c @@ -0,0 +1,10 @@ +/* PR c/108079 */ +/* { dg-do compile } */ +/* { dg-options "-Wunused-variable" } */ + +int +main () +{ + static int x; /* { dg-warning "unused variable 'x'" } */ + /* { dg-bogus "'x' defined but not used" "" { target *-*-* } .-1 } */ +}