aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2014-05-01 07:29:38 +0000
committerMarek Polacek <mpolacek@gcc.gnu.org>2014-05-01 07:29:38 +0000
commit32e007683d8eeb92afe99367049b28d27845dfc0 (patch)
tree9c7ccefdbc81e75048751b6cf48297475c07ad64 /gcc/cp
parent944052b9aea27456bc0a29ce4bc14a81103936f5 (diff)
downloadgcc-32e007683d8eeb92afe99367049b28d27845dfc0.zip
gcc-32e007683d8eeb92afe99367049b28d27845dfc0.tar.gz
gcc-32e007683d8eeb92afe99367049b28d27845dfc0.tar.bz2
re PR c/43395 (Gcc warns label as local variable)
PR c/43395 c/ * c-typeck.c (c_finish_return): Distinguish between label and variable when warning about returning local address. cp/ * typeck.c (maybe_warn_about_returning_address_of_local): Distinguish between label and variable when warning about returning local address. testsuite/ * c-c++-common/pr43395.c: New test. From-SVN: r209973
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/typeck.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c078e06..4d16855 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-01 Marek Polacek <polacek@redhat.com>
+
+ PR c/43395
+ * typeck.c (maybe_warn_about_returning_address_of_local): Distinguish
+ between label and variable when warning about returning local address.
+
2014-04-30 Jason Merrill <jason@redhat.com>
PR c++/60980
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 729e22e..8b7cb8d 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -8310,8 +8310,9 @@ maybe_warn_about_returning_address_of_local (tree retval)
warning (OPT_Wreturn_local_addr, "reference to local variable %q+D returned",
whats_returned);
else
- warning (OPT_Wreturn_local_addr, "address of local variable %q+D returned",
- whats_returned);
+ warning (OPT_Wreturn_local_addr, "address of %s %q+D returned",
+ TREE_CODE (whats_returned) == LABEL_DECL
+ ? "label" : "local variable", whats_returned);
return;
}
}