diff options
| author | steven <steven@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-10-19 14:48:29 +0000 |
|---|---|---|
| committer | steven <steven@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-10-19 14:48:29 +0000 |
| commit | 8babbffa606266c7a362a764f3fb6438a4edb695 (patch) | |
| tree | 988fb136daa7814e2926da81d9c274aa06aefc9d /gcc/c-decl.c | |
| parent | e2de980eecb57e6891f77bd74a8272208bef1ace (diff) | |
| download | gcc-8babbffa606266c7a362a764f3fb6438a4edb695.tar.gz | |
PR c/23228
* c-decl.c (pop_scope): Don't warn about an unused variable
if it is marked with TREE_NO_WARNING.
(duplicate_decls): Set TREE_NO_WARNING if olddecl and newdecl
somenow mismatch and olddecl is to be replaced.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@105621 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-decl.c')
| -rw-r--r-- | gcc/c-decl.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gcc/c-decl.c b/gcc/c-decl.c index c274df47ac4..f7cad3b7105 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -803,6 +803,7 @@ pop_scope (void) case VAR_DECL: /* Warnings for unused variables. */ if (!TREE_USED (p) + && !TREE_NO_WARNING (p) && !DECL_IN_SYSTEM_HEADER (p) && DECL_NAME (p) && !DECL_ARTIFICIAL (p) @@ -1876,7 +1877,11 @@ duplicate_decls (tree newdecl, tree olddecl) tree newtype = NULL, oldtype = NULL; if (!diagnose_mismatched_decls (newdecl, olddecl, &newtype, &oldtype)) - return false; + { + /* Avoid `unused variable' and other warnings warnings for OLDDECL. */ + TREE_NO_WARNING (olddecl) = 1; + return false; + } merge_decls (newdecl, olddecl, newtype, oldtype); return true; |