[Bug c++/25632] [4.0/4.1/4.2 Regression] ICE with const int copied into two different functions

[rakdver at atrey dot karlin dot mff dot cuni dot cz]

------- Comment #9 from rakdver at atrey dot karlin dot mff dot cuni dot cz  2006-01-03 23:29 -------
Subject: Re:  [4.0/4.1/4.2 Regression] ICE with const int copied into two
different functions

> rakdver at gcc dot gnu dot org wrote:
> > ------- Comment #6 from rakdver at gcc dot gnu dot org  2006-01-03 22:40 -------
> > Patch:
> > 
> > http://gcc.gnu.org/ml/gcc-patches/2006-01/msg00136.html
> 
> This patch is not OK, but it's close.
> 
> We should not call unshare_expr on DECL_INITIAL until after the
> mark_used call, as static data members in templates will not have proper
> initializers until after that point.  Also, there's no need to unshare
> *before* calling fold_non_dependent_expr.
> 
> In fact, there's no need to unshare before the return statement at the
> end of the function.  That will avoid creating trees that will only be
> thrown away later.

what about this patch, then (assuming it passes testing)?

Index: cp/init.c
===================================================================
*** cp/init.c   (revision 109271)
--- cp/init.c   (working copy)
*************** constant_value_1 (tree decl, bool integr
*** 1503,1508 ****
--- 1503,1510 ----
          mark_used (decl);
          init = DECL_INITIAL (decl);
        }
+       init = unshare_expr (init);
+ 
        if (!(init || init == error_mark_node)
          || !TREE_TYPE (init)
          || (integral_p


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25632