From 90aca266ceba90050158e8146fef07ad8f976e7d Mon Sep 17 00:00:00 2001 From: bje Date: Wed, 29 Sep 2004 21:23:35 +0000 Subject: [PATCH] * tree-flow.h (struct bb_ann_d): Remove num_preds member. * tree-into-ssa.c (rewrite_into_ssa): Don't set it. (rewrite_ssa_into_ssa): Likewise. * tree-phinodes.c (create_phi_node): Access the number of predecessor edges using EDGE_COUNT() and not num_preds. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88308 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 10 +++++++++- gcc/tree-flow.h | 4 ---- gcc/tree-into-ssa.c | 10 ++-------- gcc/tree-phinodes.c | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cf4671908c0..92d557b73de 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2004-09-30 Ben Elliston + + * tree-flow.h (struct bb_ann_d): Remove num_preds member. + * tree-into-ssa.c (rewrite_into_ssa): Don't set it. + (rewrite_ssa_into_ssa): Likewise. + * tree-phinodes.c (create_phi_node): Access the number of + predecessor edges using EDGE_COUNT() and not num_preds. + 2004-09-29 Joseph S. Myers PR c/7425 @@ -257,7 +265,7 @@ Properly mask the immediate field of the 'unimp' instruction. (call_symbolic_struct_value_sp32): Likewise. -2004-09-24 Ben Elliston +2004-09-28 Ben Elliston Steven Bosscher Andrew Pinski diff --git a/gcc/tree-flow.h b/gcc/tree-flow.h index d62e6b7efa0..96a2e10f1cf 100644 --- a/gcc/tree-flow.h +++ b/gcc/tree-flow.h @@ -342,10 +342,6 @@ struct bb_ann_d GTY(()) /* Chain of PHI nodes for this block. */ tree phi_nodes; - /* Number of predecessors for this block. This is only valid during - SSA rewriting. It is not maintained after conversion into SSA form. */ - int num_preds; - /* Nonzero if this block is forwardable during cfg cleanups. This is also used to detect loops during cfg cleanups. */ unsigned forwardable: 1; diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c index ec51faaa3cb..841938db1a9 100644 --- a/gcc/tree-into-ssa.c +++ b/gcc/tree-into-ssa.c @@ -1450,10 +1450,7 @@ rewrite_into_ssa (bool all) can save significant time during PHI insertion for large graphs. */ dfs = (bitmap *) xmalloc (last_basic_block * sizeof (bitmap *)); FOR_EACH_BB (bb) - { - bb_ann (bb)->num_preds = EDGE_COUNT (bb->preds); - dfs[bb->index] = BITMAP_XMALLOC (); - } + dfs[bb->index] = BITMAP_XMALLOC (); for (i = 0; i < num_referenced_vars; i++) set_current_def (referenced_var (i), NULL_TREE); @@ -1579,10 +1576,7 @@ rewrite_ssa_into_ssa (void) can save significant time during PHI insertion for large graphs. */ dfs = (bitmap *) xmalloc (last_basic_block * sizeof (bitmap *)); FOR_EACH_BB (bb) - { - bb_ann (bb)->num_preds = EDGE_COUNT (bb->preds); - dfs[bb->index] = BITMAP_XMALLOC (); - } + dfs[bb->index] = BITMAP_XMALLOC (); /* Ensure that the dominance information is OK. */ calculate_dominance_info (CDI_DOMINATORS); diff --git a/gcc/tree-phinodes.c b/gcc/tree-phinodes.c index 712e3f91c7a..6dc5c7692de 100644 --- a/gcc/tree-phinodes.c +++ b/gcc/tree-phinodes.c @@ -291,7 +291,7 @@ create_phi_node (tree var, basic_block bb) { tree phi; - phi = make_phi_node (var, bb_ann (bb)->num_preds); + phi = make_phi_node (var, EDGE_COUNT (bb->preds)); /* This is a new phi node, so note that is has not yet been rewritten. */ -- 2.11.4.GIT