tree-flow.h (struct bb_ann_d): Remove num_preds member.

	* 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.

Co-Authored-By: Andrew Pinski <pinskia@physics.uc.edu>
Co-Authored-By: Steven Bosscher <stevenb@suse.de>
From-SVN: r88308

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cf4671908c08bc1786c00ef2f4fd67bc4ac29553..92d557b73de9d36f27beb104f49bbb63a169adb3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-30  Ben Elliston  <bje@au.ibm.com>
+
+       * 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  <jsm@polyomino.org.uk>
 
        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  <bje@au.ibm.com>
+2004-09-28  Ben Elliston  <bje@au.ibm.com>
            Steven Bosscher  <stevenb@suse.de>
            Andrew Pinski  <pinskia@physics.uc.edu>
 

diff --git a/gcc/tree-flow.h b/gcc/tree-flow.h
index d62e6b7efa0882753e20ae1520b878175e08a001..96a2e10f1cfa2ad4d94775ff7d6e95a480d9674a 100644 (file)
--- 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 ec51faaa3cbef78b800fe0494ba7f2bd8c7710ec..841938db1a91065b0141f4590b70a29446fb8fe1 100644 (file)
--- 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 712e3f91c7aecd7c993438f607ec01bcc5e5a255..6dc5c7692ded5c8f51a89b21036e627c0bfe7e43 100644 (file)
--- 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.  */