re PR rtl-optimization/7145 (g++ -O with structure initializer & return value optimiz...

        PR optimization/7145
        * tree.c (cp_copy_res_decl_for_inlining): Also copy DECL_INITIAL.

From-SVN: r55261

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a29f9baac8143c8351609ed6b6123a865ba639e8..ab5c1449a8ee23b374b45dcaf2995d2d0f908ab8 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-05  Jason Merrill  <jason@redhat.com>
+
+       PR optimization/7145
+       * tree.c (cp_copy_res_decl_for_inlining): Also copy DECL_INITIAL.
+
 2002-07-05  Nathan Sidwell  <nathan@codesourcery.com>
 
        Repair damage on weak-impared targets caused by my previous patch.
@@ -555,6 +560,7 @@
 
 2002-05-18  Jason Merrill  <jason@redhat.com>
 
+       PR c++/6611
        * decl2.c (import_export_decl): If we clear
        DECL_NOT_REALLY_EXTERN, make sure DECL_EXTERNAL is set.
 

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 1fca146d4b19298c6a052b12b2544eeeb8eaa684..b7b2123cd1c7696685f4255d1d5a89e6f92022de 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -2292,6 +2292,7 @@ cp_copy_res_decl_for_inlining (result, fn, caller, decl_map_,
          DECL_SOURCE_FILE (var) = DECL_SOURCE_FILE (nrv);
          DECL_SOURCE_LINE (var) = DECL_SOURCE_LINE (nrv);
          DECL_ABSTRACT_ORIGIN (var) = DECL_ORIGIN (nrv);
+         DECL_INITIAL (var) = DECL_INITIAL (nrv);
          splay_tree_insert (decl_map,
                             (splay_tree_key) nrv,
                             (splay_tree_value) var);