3 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 273bd74..d8313a3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-13  Nathan Froyd  <froydnj@codesourcery.com>
+
+	* tree.h (struct tree_constructor): Include tree_typed instead of
+	tree_common.
+	* tree.c (initialize_tree_contains_struct): Mark TS_CONSTRUCTOR as
+	TS_TYPED instead of TS_COMMON.
+
 2011-04-12  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/sse.md (*sse2_uavgv16qi3): Merge with *avx_uavgv16qi3.
diff --git a/gcc/tree.c b/gcc/tree.c
index bb8d2e6..c233a5c 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -378,6 +378,7 @@ initialize_tree_contains_struct (void)
 	case TS_STRING:
 	case TS_COMPLEX:
 	case TS_SSA_NAME:
+	case TS_CONSTRUCTOR:
 	  MARK_TS_TYPED (code);
 	  break;
 
@@ -390,7 +391,6 @@ initialize_tree_contains_struct (void)
 	case TS_BLOCK:
 	case TS_BINFO:
 	case TS_STATEMENT_LIST:
-	case TS_CONSTRUCTOR:
 	case TS_OMP_CLAUSE:
 	case TS_OPTIMIZATION:
 	case TS_TARGET_OPTION:
diff --git a/gcc/tree.h b/gcc/tree.h
index d4ad562..806e9a6 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1613,7 +1613,7 @@ DEF_VEC_O(constructor_elt);
 DEF_VEC_ALLOC_O(constructor_elt,gc);
 
 struct GTY(()) tree_constructor {
-  struct tree_common common;
+  struct tree_typed typed;
   VEC(constructor_elt,gc) *elts;
 };