re PR c++/44859 (missed warning: returning reference to temporary)

	PR c++/44859
	* typeck.c (maybe_warn_about_returning_address_of_local): Unwrap
	COMPONENT_REFs and ARRAY_REFs sooner.

From-SVN: r208970

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index aca5f44c431333486ed6b8fb518af2a70feb9c65..553a05976cf1ad60de108ed28555eb41c430e5cc 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-31  Patrick Palka  patrick@parcs.ath.cx
+
+       PR c++/44859
+       * typeck.c (maybe_warn_about_returning_address_of_local): Unwrap
+       COMPONENT_REFs and ARRAY_REFs sooner.
+
 2014-03-29  Adam Butcher  <adam@jessamine.co.uk>
 
        PR c++/60626

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 559f19b55df30bdcd6572ec98c85e2b1339c1a95..9a80727dd8e47dee4993fcaf0618654a9303e486 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -8283,6 +8283,10 @@ maybe_warn_about_returning_address_of_local (tree retval)
     return;
   whats_returned = TREE_OPERAND (whats_returned, 0);
 
+  while (TREE_CODE (whats_returned) == COMPONENT_REF
+        || TREE_CODE (whats_returned) == ARRAY_REF)
+    whats_returned = TREE_OPERAND (whats_returned, 0);
+
   if (TREE_CODE (valtype) == REFERENCE_TYPE)
     {
       if (TREE_CODE (whats_returned) == AGGR_INIT_EXPR
@@ -8300,10 +8304,6 @@ maybe_warn_about_returning_address_of_local (tree retval)
        }
     }
 
-  while (TREE_CODE (whats_returned) == COMPONENT_REF
-        || TREE_CODE (whats_returned) == ARRAY_REF)
-    whats_returned = TREE_OPERAND (whats_returned, 0);
-
   if (DECL_P (whats_returned)
       && DECL_NAME (whats_returned)
       && DECL_FUNCTION_SCOPE_P (whats_returned)

diff --git a/gcc/testsuite/g++.dg/warn/Wreturn-local-addr-2.C b/gcc/testsuite/g++.dg/warn/Wreturn-local-addr-2.C
new file mode 100644 (file)
index 0000000..c483601
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wreturn-local-addr-2.C
@@ -0,0 +1,11 @@
+// PR c++/44859
+
+struct Base2 { int m_foo; };
+struct Derived2 : public Base2 {};
+
+const Base2& f8() { return Derived2(); } // { dg-warning "reference to temporary" }
+
+struct foo { };
+struct bar { foo base; };
+
+const foo& f9() { return bar().base; } // { dg-warning "reference to temporary" }