From: Zdenek Dvorak <dvorakz@suse.cz>
Date: Wed, 4 Jan 2006 22:46:09 +0000 (+0100)
Subject: re PR c++/25632 (ICE with const int copied into two different functions)
X-Git-Tag: releases/gcc-4.2.0~5031
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57b37fe381dc02993b054c441223f9c295249c6d;p=thirdparty%2Fgcc.git

re PR c++/25632 (ICE with const int copied into two different functions)

	PR c++/25632
	* init.c (constant_value_1): Unshare use of DECL_INITIAL.  Fix a typo
	in condition.

From-SVN: r109354
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b2967c11df16..e4873392fbe4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-04  Zdenek Dvorak <dvorakz@suse.cz>
+
+	PR c++/25632
+	* init.c (constant_value_1): Unshare use of DECL_INITIAL.  Fix a typo
+	in condition.
+
 2006-01-04  Chris Lattner  <sabre@gnu.org>
 
         * typeck2.c: update copyright to 2006
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index dbdd866f506b..3ec55109126e 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -1503,7 +1503,7 @@ constant_value_1 (tree decl, bool integral_p)
 	  mark_used (decl);
 	  init = DECL_INITIAL (decl);
 	}
-      if (!(init || init == error_mark_node)
+      if (!init || init == error_mark_node
 	  || !TREE_TYPE (init)
 	  || (integral_p
 	      ? !INTEGRAL_OR_ENUMERATION_TYPE_P (TREE_TYPE (init))
@@ -1516,7 +1516,7 @@ constant_value_1 (tree decl, bool integral_p)
 		 || TREE_CODE (init) == CONSTRUCTOR
 		 || TREE_CODE (init) == STRING_CST)))
 	break;
-      decl = init;
+      decl = unshare_expr (init);
     }
   return decl;
 }