From 29e5fea7819e8c68685774ed5b57579a1e9267bc Mon Sep 17 00:00:00 2001
From: Gabriel Dos Reis <gdr@gcc.gnu.org>
Date: Mon, 13 Sep 2004 08:36:51 +0000
Subject: [PATCH] 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
---
 gcc/cp/ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 138e388cf326..c12a9918650d 100644
--- 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
-- 
2.47.2