aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/typeck2.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4487eba..b2967c1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-04 Chris Lattner <sabre@gnu.org>
+
+ * typeck2.c: update copyright to 2006
+ (split_nonconstant_init_1): Set TREE_CONSTANT to true.
+
2006-01-04 Mark Mitchell <mark@codesourcery.com>
PR c++/24782
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 9f2d5a4..755535f 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1,7 +1,7 @@
/* Report error messages, build initializers, and perform
some front-end optimizations for C++ compiler.
Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000, 2001, 2002, 2004, 2005
+ 1999, 2000, 2001, 2002, 2004, 2005, 2006
Free Software Foundation, Inc.
Hacked by Michael Tiemann (tiemann@cygnus.com)
@@ -523,6 +523,9 @@ split_nonconstant_init_1 (tree dest, tree init)
default:
gcc_unreachable ();
}
+
+ /* The rest of the initializer is now a constant. */
+ TREE_CONSTANT (init) = 1;
}
/* A subroutine of store_init_value. Splits non-constant static