From 8f8bb1d2008496ba3856bc12f8b2cae12195c235 Mon Sep 17 00:00:00 2001 From: Zdenek Dvorak Date: Sun, 12 Nov 2006 21:59:28 +0100 Subject: [PATCH] tree-flow.h (name_mappings_registered_p): Declare. * tree-flow.h (name_mappings_registered_p): Declare. * tree-into-ssa.c (name_mappings_registered_p): New function. * tree-cfg.c (tree_can_merge_blocks_p): Check name_mappings_registered_p instead of need_ssa_update_p. From-SVN: r118732 --- gcc/ChangeLog | 7 +++++++ gcc/tree-cfg.c | 7 ++++--- gcc/tree-flow.h | 1 + gcc/tree-into-ssa.c | 7 +++++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bf52ce8d1f18..22b956f1ff5f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2006-11-12 Zdenek Dvorak + + * tree-flow.h (name_mappings_registered_p): Declare. + * tree-into-ssa.c (name_mappings_registered_p): New function. + * tree-cfg.c (tree_can_merge_blocks_p): Check + name_mappings_registered_p instead of need_ssa_update_p. + 2006-11-12 Zdenek Dvorak * tree-ssa-loop.c (tree_vectorize): Return the result of diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index ab5a234b3bcc..7c397aaa8e69 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -1200,11 +1200,13 @@ tree_can_merge_blocks_p (basic_block a, basic_block b) return false; /* It must be possible to eliminate all phi nodes in B. If ssa form - is not up-to-date, we cannot eliminate any phis. */ + is not up-to-date, we cannot eliminate any phis; however, if only + some symbols as whole are marked for renaming, this is not a problem, + as phi nodes for those symbols are irrelevant in updating anyway. */ phi = phi_nodes (b); if (phi) { - if (need_ssa_update_p ()) + if (name_mappings_registered_p ()) return false; for (; phi; phi = PHI_CHAIN (phi)) @@ -1242,7 +1244,6 @@ replace_uses_by (tree name, tree val) edge e; unsigned i; - FOR_EACH_IMM_USE_STMT (stmt, imm_iter, name) { FOR_EACH_IMM_USE_ON_STMT (use, imm_iter) diff --git a/gcc/tree-flow.h b/gcc/tree-flow.h index 8013804f7971..61910f9e1a94 100644 --- a/gcc/tree-flow.h +++ b/gcc/tree-flow.h @@ -716,6 +716,7 @@ void delete_update_ssa (void); void register_new_name_mapping (tree, tree); tree create_new_def_for (tree, tree, def_operand_p); bool need_ssa_update_p (void); +bool name_mappings_registered_p (void); bool name_registered_for_update_p (tree); bitmap ssa_names_to_replace (void); void release_ssa_name_after_update_ssa (tree name); diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c index 14a50b62c62b..3bcddfebaeb8 100644 --- a/gcc/tree-into-ssa.c +++ b/gcc/tree-into-ssa.c @@ -2659,6 +2659,13 @@ need_ssa_update_p (void) return syms_to_rename || old_ssa_names || new_ssa_names; } +/* Return true if SSA name mappings have been registered for SSA updating. */ + +bool +name_mappings_registered_p (void) +{ + return repl_tbl && htab_elements (repl_tbl) > 0; +} /* Return true if name N has been registered in the replacement table. */ -- 2.47.2