Commit bed133ea by Kazu Hirata Committed by Kazu Hirata

tree-flow.h (tree_ann_common_d): Move aux to ...

	* tree-flow.h (tree_ann_common_d): Move aux to ...
	(stmt_ann_d): ... here.
	* tree-ssa-loop-im.c (LIM_DATA, determine_invariantness_stmt,
	move_computations_stmt, schedule_sm): Update references to
	aux.
	* tree-vectorizer.h (set_stmt_info, vinfo_for_stmt): Likewise.

From-SVN: r99179
parent 9d4440a5
2005-05-03 Kazu Hirata <kazu@cs.umass.edu>
* tree-flow.h (tree_ann_common_d): Move aux to ...
(stmt_ann_d): ... here.
* tree-ssa-loop-im.c (LIM_DATA, determine_invariantness_stmt,
move_computations_stmt, schedule_sm): Update references to
aux.
* tree-vectorizer.h (set_stmt_info, vinfo_for_stmt): Likewise.
2005-05-03 Richard Henderson <rth@redhat.com> 2005-05-03 Richard Henderson <rth@redhat.com>
* config/rs6000/rs6000.c: Remove conflict markers. * config/rs6000/rs6000.c: Remove conflict markers.
......
...@@ -121,10 +121,6 @@ struct tree_ann_common_d GTY(()) ...@@ -121,10 +121,6 @@ struct tree_ann_common_d GTY(())
/* Annotation type. */ /* Annotation type. */
enum tree_ann_type type; enum tree_ann_type type;
/* Auxiliary info specific to a pass. At all times, this
should either point to valid data or be NULL. */
PTR GTY ((skip (""))) aux;
/* The value handle for this expression. Used by GVN-PRE. */ /* The value handle for this expression. Used by GVN-PRE. */
tree GTY((skip)) value_handle; tree GTY((skip)) value_handle;
}; };
...@@ -325,6 +321,10 @@ struct stmt_ann_d GTY(()) ...@@ -325,6 +321,10 @@ struct stmt_ann_d GTY(())
pass which needs statement UIDs. */ pass which needs statement UIDs. */
unsigned int uid; unsigned int uid;
/* Auxiliary info specific to a pass. At all times, this
should either point to valid data or be NULL. */
PTR GTY ((skip (""))) aux;
/* Linked list of histograms for value-based profiling. This is really a /* Linked list of histograms for value-based profiling. This is really a
struct histogram_value*. We use void* to avoid having to export that struct histogram_value*. We use void* to avoid having to export that
everywhere, and to avoid having to put it in GC memory. */ everywhere, and to avoid having to put it in GC memory. */
......
...@@ -101,7 +101,7 @@ struct lim_aux_data ...@@ -101,7 +101,7 @@ struct lim_aux_data
#define LIM_DATA(STMT) (TREE_CODE (STMT) == PHI_NODE \ #define LIM_DATA(STMT) (TREE_CODE (STMT) == PHI_NODE \
? NULL \ ? NULL \
: (struct lim_aux_data *) (stmt_ann (STMT)->common.aux)) : (struct lim_aux_data *) (stmt_ann (STMT)->aux))
/* Description of a memory reference for store motion. */ /* Description of a memory reference for store motion. */
...@@ -625,7 +625,7 @@ determine_invariantness_stmt (struct dom_walk_data *dw_data ATTRIBUTE_UNUSED, ...@@ -625,7 +625,7 @@ determine_invariantness_stmt (struct dom_walk_data *dw_data ATTRIBUTE_UNUSED,
stmt = stmt1; stmt = stmt1;
} }
stmt_ann (stmt)->common.aux = xcalloc (1, sizeof (struct lim_aux_data)); stmt_ann (stmt)->aux = xcalloc (1, sizeof (struct lim_aux_data));
LIM_DATA (stmt)->always_executed_in = outermost; LIM_DATA (stmt)->always_executed_in = outermost;
if (maybe_never && pos == MOVE_PRESERVE_EXECUTION) if (maybe_never && pos == MOVE_PRESERVE_EXECUTION)
...@@ -716,7 +716,7 @@ move_computations_stmt (struct dom_walk_data *dw_data ATTRIBUTE_UNUSED, ...@@ -716,7 +716,7 @@ move_computations_stmt (struct dom_walk_data *dw_data ATTRIBUTE_UNUSED,
cost = LIM_DATA (stmt)->cost; cost = LIM_DATA (stmt)->cost;
level = LIM_DATA (stmt)->tgt_loop; level = LIM_DATA (stmt)->tgt_loop;
free_lim_aux_data (LIM_DATA (stmt)); free_lim_aux_data (LIM_DATA (stmt));
stmt_ann (stmt)->common.aux = NULL; stmt_ann (stmt)->aux = NULL;
if (!level) if (!level)
{ {
...@@ -1171,7 +1171,7 @@ schedule_sm (struct loop *loop, edge *exits, unsigned n_exits, tree ref, ...@@ -1171,7 +1171,7 @@ schedule_sm (struct loop *loop, edge *exits, unsigned n_exits, tree ref,
/* Emit the load & stores. */ /* Emit the load & stores. */
load = build (MODIFY_EXPR, void_type_node, tmp_var, ref); load = build (MODIFY_EXPR, void_type_node, tmp_var, ref);
get_stmt_ann (load)->common.aux = xcalloc (1, sizeof (struct lim_aux_data)); get_stmt_ann (load)->aux = xcalloc (1, sizeof (struct lim_aux_data));
LIM_DATA (load)->max_loop = loop; LIM_DATA (load)->max_loop = loop;
LIM_DATA (load)->tgt_loop = loop; LIM_DATA (load)->tgt_loop = loop;
......
...@@ -241,14 +241,14 @@ static inline void ...@@ -241,14 +241,14 @@ static inline void
set_stmt_info (stmt_ann_t ann, stmt_vec_info stmt_info) set_stmt_info (stmt_ann_t ann, stmt_vec_info stmt_info)
{ {
if (ann) if (ann)
ann->common.aux = (char *) stmt_info; ann->aux = (char *) stmt_info;
} }
static inline stmt_vec_info static inline stmt_vec_info
vinfo_for_stmt (tree stmt) vinfo_for_stmt (tree stmt)
{ {
stmt_ann_t ann = stmt_ann (stmt); stmt_ann_t ann = stmt_ann (stmt);
return ann ? (stmt_vec_info) ann->common.aux : NULL; return ann ? (stmt_vec_info) ann->aux : NULL;
} }
/*-----------------------------------------------------------------*/ /*-----------------------------------------------------------------*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment