diff options
| author | Kazu Hirata <kazu@cs.umass.edu> | 2005-05-02 16:47:03 +0000 |
|---|---|---|
| committer | Kazu Hirata <kazu@gcc.gnu.org> | 2005-05-02 16:47:03 +0000 |
| commit | 075a0d547539e2229af09e58ee3917544dcf1bcc (patch) | |
| tree | 1d74b277b0be6680e162f88a3e3bfefbd9b70568 /gcc/tree-ssa-uncprop.c | |
| parent | 58646b77eddc64f8b2cb6041180c3680d85c1faf (diff) | |
| download | gcc-075a0d547539e2229af09e58ee3917544dcf1bcc.zip gcc-075a0d547539e2229af09e58ee3917544dcf1bcc.tar.gz gcc-075a0d547539e2229af09e58ee3917544dcf1bcc.tar.bz2 | |
tree-ssa-uncprop.c (equiv_hash_elt, [...]): Use VEC instead of VARRAY.
* tree-ssa-uncprop.c (equiv_hash_elt, remove_equivalence,
record_equiv, tree_ssa_uncprop, uncprop_into_successor_phis):
Use VEC instead of VARRAY.
(equiv_free): New.
From-SVN: r99104
Diffstat (limited to 'gcc/tree-ssa-uncprop.c')
| -rw-r--r-- | gcc/tree-ssa-uncprop.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/gcc/tree-ssa-uncprop.c b/gcc/tree-ssa-uncprop.c index 9f06e38..a35131b 100644 --- a/gcc/tree-ssa-uncprop.c +++ b/gcc/tree-ssa-uncprop.c @@ -300,7 +300,7 @@ struct equiv_hash_elt tree value; /* List of SSA_NAMEs which have the same value/key. */ - varray_type equivalences; + VEC(tree,heap) *equivalences; }; static void uncprop_initialize_block (struct dom_walk_data *, basic_block); @@ -325,6 +325,16 @@ equiv_eq (const void *p1, const void *p2) return operand_equal_p (value1, value2, 0); } +/* Free an instance of equiv_hash_elt. */ + +static void +equiv_free (void *p) +{ + struct equiv_hash_elt *elt = (struct equiv_hash_elt *) p; + VEC_free (tree, heap, elt->equivalences); + free (elt); +} + /* Remove the most recently recorded equivalency for VALUE. */ static void @@ -339,7 +349,7 @@ remove_equivalence (tree value) slot = htab_find_slot (equiv, &equiv_hash_elt, NO_INSERT); equiv_hash_elt_p = (struct equiv_hash_elt *) *slot; - VARRAY_POP (equiv_hash_elt_p->equivalences); + VEC_pop (tree, equiv_hash_elt_p->equivalences); } /* Record EQUIVALENCE = VALUE into our hash table. */ @@ -363,9 +373,7 @@ record_equiv (tree value, tree equivalence) equiv_hash_elt = (struct equiv_hash_elt *) *slot; - if (!equiv_hash_elt->equivalences) - VARRAY_TREE_INIT (equiv_hash_elt->equivalences, 10, "value equivs"); - VARRAY_PUSH_TREE (equiv_hash_elt->equivalences, equivalence); + VEC_safe_push (tree, heap, equiv_hash_elt->equivalences, equivalence); } /* Main driver for un-cprop. */ @@ -379,7 +387,7 @@ tree_ssa_uncprop (void) associate_equivalences_with_edges (); /* Create our global data structures. */ - equiv = htab_create (1024, equiv_hash, equiv_eq, free); + equiv = htab_create (1024, equiv_hash, equiv_eq, equiv_free); equiv_stack = VEC_alloc (tree, heap, 2); /* We're going to do a dominator walk, so ensure that we have @@ -508,9 +516,9 @@ uncprop_into_successor_phis (struct dom_walk_data *walk_data ATTRIBUTE_UNUSED, then replace the value in the argument with its equivalent SSA_NAME. Use the most recent equivalence as hopefully that results in shortest lifetimes. */ - for (j = VARRAY_ACTIVE_SIZE (elt->equivalences) - 1; j >= 0; j--) + for (j = VEC_length (tree, elt->equivalences) - 1; j >= 0; j--) { - tree equiv = VARRAY_TREE (elt->equivalences, j); + tree equiv = VEC_index (tree, elt->equivalences, j); if (SSA_NAME_VAR (equiv) == SSA_NAME_VAR (PHI_RESULT (phi))) { |