* decl.c (finish_function): Don't skip a block.

From-SVN: r64508

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 28883b2b91e1e580933802ef61d124beb2b78c8a..888fcb988a23efa328213fe424311f1b7e80c6a1 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
 2003-03-17  Jason Merrill  <jason@redhat.com>
 
+       * decl.c (finish_function): Don't skip a block.
+
        PR c++/9993
        * decl.c (finish_function): Only allow the NRVO to use variables
        declared at function scope.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 7ba863d4347e45d97e5e857b3db9f480be64ddec..82ea2279ab2469055836f8a79311d899eecc7434 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -14319,8 +14319,7 @@ finish_function (flags)
             the function so we know that their lifetime always ends with a
             return; see g++.dg/opt/nrv6.C.  We could be more flexible if
             we were to do this optimization in tree-ssa.  */
-         /* Skip the artificial function body block.  */
-         && (outer = BLOCK_SUBBLOCKS (BLOCK_SUBBLOCKS (DECL_INITIAL (fndecl))),
+         && (outer = BLOCK_SUBBLOCKS (DECL_INITIAL (fndecl)),
              chain_member (r, BLOCK_VARS (outer))))
        {