On Fri, Mar 11, 2011 at 5:23 AM, Nathan Froyd <[email protected]> wrote:
> A straightforward conversion.
Ok for 4.7.
Thanks,
Richard.
> -Nathan
>
> gcc/
> * tree.h (struct tree_constructor): Include typed_tree instead of
> tree_common.
> * tree.c (initialize_tree_contains_struct): Mark TS_CONSTRUCTOR as
> TS_TYPED instead of TS_COMMON.
>
> diff --git a/gcc/tree.c b/gcc/tree.c
> index 072ff19..da16641 100644
> --- a/gcc/tree.c
> +++ b/gcc/tree.c
> @@ -377,6 +377,7 @@ initialize_tree_contains_struct (void)
> case TS_STRING:
> case TS_COMPLEX:
> case TS_SSA_NAME:
> + case TS_CONSTRUCTOR:
> MARK_TS_TYPED (code);
> break;
>
> @@ -389,7 +390,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 80888bc..35479f9 100644
> --- a/gcc/tree.h
> +++ b/gcc/tree.h
> @@ -1614,7 +1614,7 @@ DEF_VEC_O(constructor_elt);
> DEF_VEC_ALLOC_O(constructor_elt,gc);
>
> struct GTY(()) tree_constructor {
> - struct tree_common common;
> + struct typed_tree typed;
> VEC(constructor_elt,gc) *elts;
> };
>
> --
> 1.7.0.4
>
>