From 0e797c2e325bfe0676fc9b9e5baee01aefb164f5 Mon Sep 17 00:00:00 2001 From: paolo Date: Mon, 20 Aug 2012 17:38:53 +0000 Subject: [PATCH] /cp 2012-08-20 Paolo Carlini PR c++/10416 * decl.c (poplevel): Check TYPE_HAS_NONTRIVIAL_DESTRUCTOR for Wunused_variable too. /testsuite 2012-08-20 Paolo Carlini PR c++/10416 * g++.dg/warn/Wunused-var-17.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@190538 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 10 +++++----- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/warn/Wunused-var-17.C | 4 ++++ 4 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/g++.dg/warn/Wunused-var-17.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5c4f362..2ac0deb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2012-08-20 Paolo Carlini + + PR c++/10416 + * decl.c (poplevel): Check TYPE_HAS_NONTRIVIAL_DESTRUCTOR for + Wunused_variable too. + 2012-08-20 Diego Novillo * decl.c (poplevel): Start TV_NAME_LOOKUP conditionally. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 0dad597..365ca94 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -621,16 +621,16 @@ poplevel (int keep, int reverse, int functionbody) if (TREE_CODE (decl) == VAR_DECL && (! TREE_USED (decl) || !DECL_READ_P (decl)) && ! DECL_IN_SYSTEM_HEADER (decl) - && DECL_NAME (decl) && ! DECL_ARTIFICIAL (decl)) + && DECL_NAME (decl) && ! DECL_ARTIFICIAL (decl) + && TREE_TYPE (decl) != error_mark_node + && (!CLASS_TYPE_P (TREE_TYPE (decl)) + || !TYPE_HAS_NONTRIVIAL_DESTRUCTOR (TREE_TYPE (decl)))) { if (! TREE_USED (decl)) warning (OPT_Wunused_variable, "unused variable %q+D", decl); else if (DECL_CONTEXT (decl) == current_function_decl - && TREE_TYPE (decl) != error_mark_node && TREE_CODE (TREE_TYPE (decl)) != REFERENCE_TYPE - && errorcount == unused_but_set_errorcount - && (!CLASS_TYPE_P (TREE_TYPE (decl)) - || !TYPE_HAS_NONTRIVIAL_DESTRUCTOR (TREE_TYPE (decl)))) + && errorcount == unused_but_set_errorcount) { warning (OPT_Wunused_but_set_variable, "variable %q+D set but not used", decl); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3ff68d8..686e041 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-08-20 Paolo Carlini + + PR c++/10416 + * g++.dg/warn/Wunused-var-17.C: New. + 2012-08-20 Patrick Marlier PR middle-end/53992 diff --git a/gcc/testsuite/g++.dg/warn/Wunused-var-17.C b/gcc/testsuite/g++.dg/warn/Wunused-var-17.C new file mode 100644 index 0000000..01650e1 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wunused-var-17.C @@ -0,0 +1,4 @@ +// PR c++/10416 +// { dg-options "-Wunused" } + +void f () { struct atend { ~atend () { __builtin_printf("leaving f\n"); } } a; } -- 2.7.4