backport: re PR c++/15461 (ICE due to NRV and inlining)

        Backport from gcc-3_4-branch
        2004-08-24  Jason Merrill  <jason@redhat.com>
        PR c++/15461
        * semantics.c (nullify_returns_r): Replace a DECL_STMT
        for the NRV with an INIT_EXPR.

From-SVN: r87427

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 138e388cf326eb1501cd32142ba793d3005f6a08..c12a9918650d93fe28e401a176af67a19d89a434 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-13  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+       Backport from gcc-3_4-branch
+       2004-08-24  Jason Merrill  <jason@redhat.com>
+       PR c++/15461
+       * semantics.c (nullify_returns_r): Replace a DECL_STMT
+       for the NRV with an INIT_EXPR.
+
 2004-07-24  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
        PR c++/16175