From 731d55e7ce85ec145d390e8ab6923af321d854b2 Mon Sep 17 00:00:00 2001 From: rguenth Date: Thu, 5 Jan 2006 09:58:57 +0000 Subject: 2006-01-05 Richard Guenther * tree-flow.h (struct fieldoff): Decompose field to type, size and decl. * tree-ssa-alias.c (create_sft): Take type as parameter. (create_overlap_variables_for): Store type, size and decl in the fieldoff structure. * tree-ssa-structalias.c (fieldoff_compare): Adjust users of struct fieldoff. (push_fields_onto_fieldstack): Likewise. (create_variable_info_for): Likewise. Use offset for the SFT name if the decl is not available. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109376 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/tree-ssa-alias.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gcc/tree-ssa-alias.c') diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c index d7f12c35cea..5813a653b15 100644 --- a/gcc/tree-ssa-alias.c +++ b/gcc/tree-ssa-alias.c @@ -2515,14 +2515,14 @@ get_or_create_used_part_for (size_t uid) } -/* Create and return a structure sub-variable for field FIELD of +/* Create and return a structure sub-variable for field type FIELD of variable VAR. */ static tree create_sft (tree var, tree field) { var_ann_t ann; - tree subvar = create_tag_raw (STRUCT_FIELD_TAG, TREE_TYPE (field), "SFT"); + tree subvar = create_tag_raw (STRUCT_FIELD_TAG, field, "SFT"); /* We need to copy the various flags from VAR to SUBVAR, so that they are is_global_var iff the original variable was. */ @@ -2578,9 +2578,9 @@ create_overlap_variables_for (tree var) for (i = 0; VEC_iterate (fieldoff_s, fieldstack, i, fo); i++) { - if (!DECL_SIZE (fo->field) - || TREE_CODE (DECL_SIZE (fo->field)) != INTEGER_CST - || TREE_CODE (TREE_TYPE (fo->field)) == ARRAY_TYPE + if (!fo->size + || TREE_CODE (fo->size) != INTEGER_CST + || TREE_CODE (fo->type) == ARRAY_TYPE || fo->offset < 0) { notokay = true; @@ -2632,8 +2632,8 @@ create_overlap_variables_for (tree var) HOST_WIDE_INT fosize; tree currfotype; - fosize = TREE_INT_CST_LOW (DECL_SIZE (fo->field)); - currfotype = TREE_TYPE (fo->field); + fosize = TREE_INT_CST_LOW (fo->size); + currfotype = fo->type; /* If this field isn't in the used portion, or it has the exact same offset and size as the last @@ -2650,7 +2650,7 @@ create_overlap_variables_for (tree var) sv->offset = fo->offset; sv->size = fosize; sv->next = *subvars; - sv->var = create_sft (var, fo->field); + sv->var = create_sft (var, fo->type); if (dump_file) { -- cgit v1.2.1