From c7463db95a98bc9b4372e2ab77df993f5dddd337 Mon Sep 17 00:00:00 2001 From: Daniel Berlin Date: Sun, 10 Dec 2006 22:39:41 +0000 Subject: [PATCH] tree-ssa-alias.c (compact_name_tags): Use sort_tags_by_id. 2006-12-10 Daniel Berlin * tree-ssa-alias.c (compact_name_tags): Use sort_tags_by_id. (tree_pointer_compare): Remove. From-SVN: r119714 --- gcc/ChangeLog | 5 +++++ gcc/tree-ssa-alias.c | 18 +++--------------- gcc/tree-ssa-ter.c | 3 ++- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cabbcd172806..cef245c68a16 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2006-12-10 Daniel Berlin + + * tree-ssa-alias.c (compact_name_tags): Use sort_tags_by_id. + (tree_pointer_compare): Remove. + 2006-12-10 Zdenek Dvorak * tree-vrp.c (adjust_range_with_scev): Use get_chrec_loop. diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c index b39553ea832f..3d4fe56e654a 100644 --- a/gcc/tree-ssa-alias.c +++ b/gcc/tree-ssa-alias.c @@ -1293,19 +1293,6 @@ group_aliases_into (tree tag, bitmap tag_aliases, struct alias_info *ai) tag_ann->may_aliases = NULL; } -/* Simple comparison function for qsort that sorts based on pointer - address. */ - -static int -tree_pointer_compare (const void *pa, const void *pb) -{ - const tree a = *((const tree *)pa); - const tree b = *((const tree *)pb); - - return b - a; -} - - /* Replacing may aliases in name tags during grouping can up with the same SMT multiple times in the may_alias list. It's quicker to just remove them post-hoc than it is to avoid them during @@ -1333,8 +1320,9 @@ compact_name_tags (void) if (VEC_length (tree, aliases) > 1) { bool changed = false; - qsort (VEC_address (tree, aliases), VEC_length (tree, aliases), - sizeof (tree), tree_pointer_compare); + qsort (VEC_address (tree, aliases), + VEC_length (tree, aliases), + sizeof (tree), sort_tags_by_id); for (i = 0; VEC_iterate (tree, aliases, i, alias); i++) { diff --git a/gcc/tree-ssa-ter.c b/gcc/tree-ssa-ter.c index 78f8a121f099..513541d61471 100644 --- a/gcc/tree-ssa-ter.c +++ b/gcc/tree-ssa-ter.c @@ -672,7 +672,8 @@ dump_replaceable_exprs (FILE *f, tree *expr) gcc_assert (var != NULL_TREE); print_generic_expr (f, var, TDF_SLIM); fprintf (f, " replace with --> "); - print_generic_expr (f, TREE_OPERAND (stmt, 1), TDF_SLIM); + print_generic_expr (f, GENERIC_TREE_OPERAND (stmt, 1), + TDF_SLIM); fprintf (f, "\n"); } fprintf (f, "\n"); -- 2.47.3