From 4862826d55a2cdc42cfa3093b90349fc234dee6c Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sat, 11 Aug 2007 17:21:56 +0000 Subject: alias.h (alias_set_type): Define new type. ./: * alias.h (alias_set_type): Define new type. (ALIAS_SET_MEMORY_BARRIER): Use it. * rtl.h: Include alias.h. (struct mem_attrs): Use alias_set_type. * tree.h: Include alias.h (struct tree_type): Use alias_set_type. (struct tree_struct_field_tag): Likewise. (struct tree_decl_common): Likewise. * alias.c (struct alias_set_entry): Use alias_set_type. (get_alias_set_entry, alias_set_subset_of): Likewise. (alias_sets_conflict_p): Likewise. (alias_sets_must_conflict_p): Likewise. (objects_must_conflict_p): Likewise. (get_alias_set, new_alias_set): Likewise. (record_alias_subset, record_component_aliases): Likewise. (varargs_set, frame_set): Change to alias_set_type. (get_varargs_alias_set): Use alias_set_type. (get_frame_alias_set): Likewise. * builtins.c (setjmp_alias_set): Change to alias_set_type. * dse.c (struct store_info): Use alias_set_type. (struct read_info, struct clear_alias_mode_holder): Likewise. (clear_alias_set_lookup, canon_address): Likewise. (record_store, check_mem_read_rtx): Likewise. (dse_record_singleton_alias_set): Likewise. (dse_invalidate_singleton_alias_set): Likewise. * emit-rtl.c (get_mem_attrs): Likewise. (set_mem_attributes_minus_bitpos): Likewise. (set_mem_alias_set): Likewise. * expr.c (store_constructor_field, store_field): Likewise. * gimplify.c (struct gimplify_init_ctor_preeval_data): Likewise. * langhooks.c (lhd_get_alias_set): Likewise. * langhooks-def.h (lhd_get_alias_set): Likewise. * reload1.c (alter_reg): Likewise. * tree-flow.h (struct fieldoff): Likewise. * tree-ssa-alias.c (struct alias_map_d): Likewise. (may_alias_p, get_smt_for, create_sft): Likewise. * tree-ssa-alias-warnings.c (nonstandard_alias_types_p): Likewise. * tree-ssa-structalias.c (set_uids_in_ptset): Likewise. (merge_smts_into): Likewise. * varasm.c (const_alias_set): Likewise. * c-common.c (strict_aliasing_warning): Likewise. (c_common_get_alias_set): Likewise. * dse.h (dse_record_singleton_alias_set): Update declaration. (dse_invalidate_singleton_alias_set): Likewise. * emit-rtl.h (set_mem_alias_set): Likewise. * c-common.h (c_common_get_alias_set): Likewise. * print-rtl.c (print_rtx): Cast MEM_ALIAS_SET when printing it. * print-tree.c (print_node): Likewise. * config/alpha/alpha.c (alpha_sr_alias_set): Change to alias_set_type. (alpha_setup_incoming_varargs): Use alias_set_type. * config/i386/i386.c (setup_incoming_varargs_64): Use alias_set_type. (setup_incoming_varargs_ms_64): Likewise. (ix86_GOT_alias_set): Likewise. * config/mn10300/mn10300.c (mn10300_builtin_saveregs): Likewise. * config/rs6000/rs6000.c (setup_incoming_varargs): Likewise. (set): Change to alias_set_type. (get_TOC_alias_set): Use alias_set_type. * config/rs6000/rs6000-protos.h (get_TOC_alias_set): Update declaration. * config/sh/sh.c (sh_builtin_saveregs): Use alias_set_type. * config/sparc/sparc.c (sparc_sr_alias_set): Change to alias_set_type. (struct_value_alias_set): Likewise. * Makefile.in (GTFILES): Add $(srcdir)/alias.h. ada/: * misc.c (gnat_get_alias_set): Change return type to alias_set_type. cp/: * cp-objcp-common.c (cxx_get_alias_set): Change return type to alias_set_type. * cp/cp-tree.h (cxx_get_alias_set): Update declaration. fortran:/ * f95-lang.c (gfc_get_alias_set): Change return type to alias_set_type. From-SVN: r127362 --- gcc/alias.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'gcc/alias.c') diff --git a/gcc/alias.c b/gcc/alias.c index 689c944c54e..518164e4dcd 100644 --- a/gcc/alias.c +++ b/gcc/alias.c @@ -131,7 +131,7 @@ along with GCC; see the file COPYING3. If not see struct alias_set_entry GTY(()) { /* The alias set number, as stored in MEM_ALIAS_SET. */ - HOST_WIDE_INT alias_set; + alias_set_type alias_set; /* The children of the alias set. These are not just the immediate children, but, in fact, all descendants. So, if we have: @@ -157,7 +157,7 @@ static rtx find_base_value (rtx); static int mems_in_disjoint_alias_sets_p (const_rtx, const_rtx); static int insert_subset_children (splay_tree_node, void*); static tree find_base_decl (tree); -static alias_set_entry get_alias_set_entry (HOST_WIDE_INT); +static alias_set_entry get_alias_set_entry (alias_set_type); static const_rtx fixed_scalar_and_varying_struct_p (const_rtx, const_rtx, rtx, rtx, bool (*) (const_rtx, bool)); static int aliases_everything_p (const_rtx); @@ -168,7 +168,7 @@ static int nonoverlapping_memrefs_p (const_rtx, const_rtx); static int write_dependence_p (const_rtx, const_rtx, int); static void memory_modified_1 (rtx, const_rtx, void *); -static void record_alias_subset (HOST_WIDE_INT, HOST_WIDE_INT); +static void record_alias_subset (alias_set_type, alias_set_type); /* Set up all info needed to perform alias analysis on memory references. */ @@ -257,7 +257,7 @@ static GTY (()) VEC(alias_set_entry,gc) *alias_sets; such an entry, or NULL otherwise. */ static inline alias_set_entry -get_alias_set_entry (HOST_WIDE_INT alias_set) +get_alias_set_entry (alias_set_type alias_set) { return VEC_index (alias_set_entry, alias_sets, alias_set); } @@ -295,7 +295,7 @@ insert_subset_children (splay_tree_node node, void *data) /* Return true if the first alias set is a subset of the second. */ bool -alias_set_subset_of (HOST_WIDE_INT set1, HOST_WIDE_INT set2) +alias_set_subset_of (alias_set_type set1, alias_set_type set2) { alias_set_entry ase; @@ -315,7 +315,7 @@ alias_set_subset_of (HOST_WIDE_INT set1, HOST_WIDE_INT set2) /* Return 1 if the two specified alias sets may conflict. */ int -alias_sets_conflict_p (HOST_WIDE_INT set1, HOST_WIDE_INT set2) +alias_sets_conflict_p (alias_set_type set1, alias_set_type set2) { alias_set_entry ase; @@ -347,7 +347,7 @@ alias_sets_conflict_p (HOST_WIDE_INT set1, HOST_WIDE_INT set2) /* Return 1 if the two specified alias sets will always conflict. */ int -alias_sets_must_conflict_p (HOST_WIDE_INT set1, HOST_WIDE_INT set2) +alias_sets_must_conflict_p (alias_set_type set1, alias_set_type set2) { if (set1 == 0 || set2 == 0 || set1 == set2) return 1; @@ -363,7 +363,7 @@ alias_sets_must_conflict_p (HOST_WIDE_INT set1, HOST_WIDE_INT set2) int objects_must_conflict_p (tree t1, tree t2) { - HOST_WIDE_INT set1, set2; + alias_set_type set1, set2; /* If neither has a type specified, we don't know if they'll conflict because we may be using them to store objects of various types, for @@ -485,10 +485,10 @@ component_uses_parent_alias_set (tree t) /* Return the alias set for T, which may be either a type or an expression. Call language-specific routine for help, if needed. */ -HOST_WIDE_INT +alias_set_type get_alias_set (tree t) { - HOST_WIDE_INT set; + alias_set_type set; /* If we're not doing any alias analysis, just assume everything aliases everything else. Also return 0 if this or its type is @@ -541,7 +541,7 @@ get_alias_set (tree t) alias set for the restricted pointer a subset of the alias set for the type pointed to by the type of the decl. */ - HOST_WIDE_INT pointed_to_alias_set + alias_set_type pointed_to_alias_set = get_alias_set (pointed_to_type); if (pointed_to_alias_set == 0) @@ -646,7 +646,7 @@ get_alias_set (tree t) /* Return a brand-new alias set. */ -HOST_WIDE_INT +alias_set_type new_alias_set (void) { if (flag_strict_aliasing) @@ -674,7 +674,7 @@ new_alias_set (void) subset of alias set zero. */ static void -record_alias_subset (HOST_WIDE_INT superset, HOST_WIDE_INT subset) +record_alias_subset (alias_set_type superset, alias_set_type subset) { alias_set_entry superset_entry; alias_set_entry subset_entry; @@ -730,7 +730,7 @@ record_alias_subset (HOST_WIDE_INT superset, HOST_WIDE_INT subset) void record_component_aliases (tree type) { - HOST_WIDE_INT superset = get_alias_set (type); + alias_set_type superset = get_alias_set (type); tree field; if (superset == 0) @@ -774,9 +774,9 @@ record_component_aliases (tree type) /* Allocate an alias set for use in storing and reading from the varargs spill area. */ -static GTY(()) HOST_WIDE_INT varargs_set = -1; +static GTY(()) alias_set_type varargs_set = -1; -HOST_WIDE_INT +alias_set_type get_varargs_alias_set (void) { #if 1 @@ -796,9 +796,9 @@ get_varargs_alias_set (void) /* Likewise, but used for the fixed portions of the frame, e.g., register save areas. */ -static GTY(()) HOST_WIDE_INT frame_set = -1; +static GTY(()) alias_set_type frame_set = -1; -HOST_WIDE_INT +alias_set_type get_frame_alias_set (void) { if (frame_set == -1) -- cgit v1.2.1