tree-flow.h (struct var_ann_d): Rename field is_alias_tag to is_aliased.

* tree-flow.h (struct var_ann_d): Rename field is_alias_tag to
	is_aliased.
	Update all users.

From-SVN: r111249
This commit is contained in:
Diego Novillo 2006-02-18 20:31:28 +00:00 committed by Diego Novillo
parent 3f2de3dcf9
commit faf7c6784e
6 changed files with 25 additions and 19 deletions

View File

@ -1,3 +1,9 @@
2006-02-18 Diego Novillo <dnovillo@redhat.com>
* tree-flow.h (struct var_ann_d): Rename field is_alias_tag to
is_aliased.
Update all users.
2006-02-18 Jakub Jelinek <jakub@redhat.com> 2006-02-18 Jakub Jelinek <jakub@redhat.com>
PR middle-end/26334 PR middle-end/26334

View File

@ -350,8 +350,8 @@ dump_variable (FILE *file, tree var)
print_generic_expr (file, ann->type_mem_tag, dump_flags); print_generic_expr (file, ann->type_mem_tag, dump_flags);
} }
if (ann && ann->is_alias_tag) if (ann && ann->is_aliased)
fprintf (file, ", is an alias tag"); fprintf (file, ", is aliased");
if (TREE_ADDRESSABLE (var)) if (TREE_ADDRESSABLE (var))
fprintf (file, ", is addressable"); fprintf (file, ", is addressable");

View File

@ -164,10 +164,8 @@ struct var_ann_d GTY(())
/* Used when building root_var structures in tree_ssa_live.[ch]. */ /* Used when building root_var structures in tree_ssa_live.[ch]. */
unsigned root_var_processed : 1; unsigned root_var_processed : 1;
/* Nonzero if this variable is an alias tag that represents references to /* Nonzero if this variable is in the alias set of another variable. */
other variables (i.e., this variable appears in the MAY_ALIASES array unsigned is_aliased : 1;
of other variables). */
unsigned is_alias_tag : 1;
/* Nonzero if this variable was used after SSA optimizations were /* Nonzero if this variable was used after SSA optimizations were
applied. We set this when translating out of SSA form. */ applied. We set this when translating out of SSA form. */
@ -206,7 +204,6 @@ struct var_ann_d GTY(())
current version of this variable (an SSA_NAME). */ current version of this variable (an SSA_NAME). */
tree current_def; tree current_def;
/* If this variable is a structure, this fields holds a list of /* If this variable is a structure, this fields holds a list of
symbols representing each of the fields of the structure. */ symbols representing each of the fields of the structure. */
subvar_t subvars; subvar_t subvars;

View File

@ -766,7 +766,7 @@ init_alias_info (void)
{ {
var_ann_t ann = var_ann (var); var_ann_t ann = var_ann (var);
ann->is_alias_tag = 0; ann->is_aliased = 0;
ann->may_aliases = NULL; ann->may_aliases = NULL;
NUM_REFERENCES_CLEAR (ann); NUM_REFERENCES_CLEAR (ann);
@ -1209,7 +1209,7 @@ group_aliases_into (tree tag, bitmap tag_aliases, struct alias_info *ai)
var_ann_t ann = var_ann (var); var_ann_t ann = var_ann (var);
/* Make TAG the unique alias of VAR. */ /* Make TAG the unique alias of VAR. */
ann->is_alias_tag = 0; ann->is_aliased = 0;
ann->may_aliases = NULL; ann->may_aliases = NULL;
/* Note that VAR and TAG may be the same if the function has no /* Note that VAR and TAG may be the same if the function has no
@ -1849,7 +1849,7 @@ add_may_alias (tree var, tree alias)
return; return;
VEC_safe_push (tree, gc, v_ann->may_aliases, alias); VEC_safe_push (tree, gc, v_ann->may_aliases, alias);
a_ann->is_alias_tag = 1; a_ann->is_aliased = 1;
} }
@ -2454,7 +2454,7 @@ is_aliased_with (tree tag, tree sym)
VEC(tree,gc) *aliases; VEC(tree,gc) *aliases;
tree al; tree al;
if (var_ann (sym)->is_alias_tag) if (var_ann (sym)->is_aliased)
{ {
aliases = var_ann (tag)->may_aliases; aliases = var_ann (tag)->may_aliases;

View File

@ -1740,6 +1740,7 @@ access_can_touch_variable (tree ref, tree alias, HOST_WIDE_INT offset,
return true; return true;
} }
/* Add VAR to the virtual operands array. FLAGS is as in /* Add VAR to the virtual operands array. FLAGS is as in
get_expr_operands. FULL_REF is a tree that contains the entire get_expr_operands. FULL_REF is a tree that contains the entire
pointer dereference expression, if available, or NULL otherwise. pointer dereference expression, if available, or NULL otherwise.
@ -1780,7 +1781,6 @@ add_virtual_operand (tree var, stmt_ann_t s_ann, int flags,
if ((flags & opf_non_specific) && unmodifiable_var_p (var)) if ((flags & opf_non_specific) && unmodifiable_var_p (var))
flags &= ~(opf_is_def | opf_kill_def); flags &= ~(opf_is_def | opf_kill_def);
/* The variable is not a GIMPLE register. Add it (or its aliases) to /* The variable is not a GIMPLE register. Add it (or its aliases) to
virtual operands, unless the caller has specifically requested virtual operands, unless the caller has specifically requested
not to add virtual operands (used when adding operands inside an not to add virtual operands (used when adding operands inside an
@ -1845,7 +1845,8 @@ add_virtual_operand (tree var, stmt_ann_t s_ann, int flags,
It is also necessary to add bare defs on clobbers for It is also necessary to add bare defs on clobbers for
TMT's, so that bare TMT uses caused by pruning all the TMT's, so that bare TMT uses caused by pruning all the
aliases will link up properly with calls. */ aliases will link up properly with calls. */
if (v_ann->is_alias_tag || none_added if (v_ann->is_aliased
|| none_added
|| (TREE_CODE (var) == TYPE_MEMORY_TAG && for_clobber)) || (TREE_CODE (var) == TYPE_MEMORY_TAG && for_clobber))
append_v_may_def (var); append_v_may_def (var);
} }
@ -1862,13 +1863,14 @@ add_virtual_operand (tree var, stmt_ann_t s_ann, int flags,
/* Similarly, append a virtual uses for VAR itself, when /* Similarly, append a virtual uses for VAR itself, when
it is an alias tag. */ it is an alias tag. */
if (v_ann->is_alias_tag || none_added) if (v_ann->is_aliased || none_added)
append_vuse (var); append_vuse (var);
} }
} }
} }
/* Add *VAR_P to the appropriate operand array for INFO. FLAGS is as in
/* Add *VAR_P to the appropriate operand array for S_ANN. FLAGS is as in
get_expr_operands. If *VAR_P is a GIMPLE register, it will be added to get_expr_operands. If *VAR_P is a GIMPLE register, it will be added to
the statement's real operands, otherwise it is added to virtual the statement's real operands, otherwise it is added to virtual
operands. */ operands. */
@ -1884,8 +1886,9 @@ add_stmt_operand (tree *var_p, stmt_ann_t s_ann, int flags)
gcc_assert (SSA_VAR_P (var)); gcc_assert (SSA_VAR_P (var));
is_real_op = is_gimple_reg (var); is_real_op = is_gimple_reg (var);
/* If this is a real operand, the operand is either ssa name or decl.
Virtual operands may only be decls. */ /* If this is a real operand, the operand is either an SSA name or a
decl. Virtual operands may only be decls. */
gcc_assert (is_real_op || DECL_P (var)); gcc_assert (is_real_op || DECL_P (var));
sym = (TREE_CODE (var) == SSA_NAME ? SSA_NAME_VAR (var) : var); sym = (TREE_CODE (var) == SSA_NAME ? SSA_NAME_VAR (var) : var);

View File

@ -406,10 +406,10 @@ verify_flow_insensitive_alias_info (void)
ann = var_ann (var); ann = var_ann (var);
if (!MTAG_P (var) if (!MTAG_P (var)
&& ann->is_alias_tag && ann->is_aliased
&& !bitmap_bit_p (visited, DECL_UID (var))) && !bitmap_bit_p (visited, DECL_UID (var)))
{ {
error ("addressable variable that is an alias tag but is not in any alias set"); error ("addressable variable that is aliased but is not in any alias set");
goto err; goto err;
} }
} }