* tree-phinodes.c (remove_phi_node): Drop the last argument.

	* tree-flow.h: Adjust the prototype for remove_phi_node.
	* lambda-code.c (perfect_nestify): Adjust a call to
	remove_phi_node.
	* tree-cfg.c
	(remove_phi_nodes_and_edges_for_unreachable_block): Likewise.
	* tree-outof-ssa.c (eliminate_virtual_phis, remove_ssa_form):
	Likewise.
	* tree-ssa-dce.c (remove_dead_phis): Likewise.
	* tree-ssa-loop-ivopts.c (remove_statement): Likewise.
	* tree-ssa-pre.c (remove_dead_inserted_code): Likewise.
	* tree-ssa.c (kill_redundant_phi_nodes): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95932 138bc75d-0d04-0410-961f-82ee72b054a4

10 files changed, 24 insertions, 11 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7a8a848e741..ab6f6172252 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -8,6 +8,19 @@
 	gensupport.c, jump.c, tree-phinodes.c, unwind-dw2-fde-glibc.c:
 	Update copyright.
 
+	* tree-phinodes.c (remove_phi_node): Drop the last argument.
+	* tree-flow.h: Adjust the prototype for remove_phi_node.
+	* lambda-code.c (perfect_nestify): Adjust a call to
+	remove_phi_node.
+	* tree-cfg.c
+	(remove_phi_nodes_and_edges_for_unreachable_block): Likewise.
+	* tree-outof-ssa.c (eliminate_virtual_phis, remove_ssa_form):
+	Likewise.
+	* tree-ssa-dce.c (remove_dead_phis): Likewise.
+	* tree-ssa-loop-ivopts.c (remove_statement): Likewise.
+	* tree-ssa-pre.c (remove_dead_inserted_code): Likewise.
+	* tree-ssa.c (kill_redundant_phi_nodes): Likewise.
+
 2005-03-05  Richard Sandiford  <rsandifo@redhat.com>
 
 	* doc/invoke.texi: Document new MIPS -msym32 and -mno-sym32 options.
diff --git a/gcc/lambda-code.c b/gcc/lambda-code.c
index 909c28dd371..a19ab92cd38 100644
--- a/gcc/lambda-code.c
+++ b/gcc/lambda-code.c
@@ -2327,7 +2327,7 @@ perfect_nestify (struct loops *loops,
   while (phi_nodes (olddest) != NULL)
     {
       SET_PHI_RESULT (phi_nodes (olddest), NULL);
-      remove_phi_node (phi_nodes (olddest), NULL, olddest);
+      remove_phi_node (phi_nodes (olddest), NULL);
     }      
 
   /* and add them back to the new basic block.  */
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 6ba0a02b8d0..b87ce54c291 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -1997,7 +1997,7 @@ remove_phi_nodes_and_edges_for_unreachable_block (basic_block bb)
   while (phi)
     {
       tree next = PHI_CHAIN (phi);
-      remove_phi_node (phi, NULL_TREE, bb);
+      remove_phi_node (phi, NULL_TREE);
       phi = next;
     }
 
diff --git a/gcc/tree-flow.h b/gcc/tree-flow.h
index 82402c27a0f..b0c0f864413 100644
--- a/gcc/tree-flow.h
+++ b/gcc/tree-flow.h
@@ -522,7 +522,7 @@ extern void reserve_phi_args_for_new_edge (basic_block);
 extern tree create_phi_node (tree, basic_block);
 extern void add_phi_arg (tree, tree, edge);
 extern void remove_phi_args (edge);
-extern void remove_phi_node (tree, tree, basic_block);
+extern void remove_phi_node (tree, tree);
 extern void remove_all_phi_nodes_for (bitmap);
 extern tree phi_reverse (tree);
 extern void dump_dfa_stats (FILE *);
diff --git a/gcc/tree-outof-ssa.c b/gcc/tree-outof-ssa.c
index 2eaa2713984..9e40698a84f 100644
--- a/gcc/tree-outof-ssa.c
+++ b/gcc/tree-outof-ssa.c
@@ -1030,7 +1030,7 @@ eliminate_virtual_phis (void)
 		    }
 		}
 #endif
-	      remove_phi_node (phi, NULL_TREE, bb);
+	      remove_phi_node (phi, NULL_TREE);
 	    }
 	}
     }
@@ -2371,7 +2371,7 @@ remove_ssa_form (FILE *dump, var_map map, int flags)
       for (phi = phi_nodes (bb); phi; phi = next)
 	{
 	  next = PHI_CHAIN (phi);
-	  remove_phi_node (phi, NULL_TREE, bb);
+	  remove_phi_node (phi, NULL_TREE);
 	}
     }
 
diff --git a/gcc/tree-phinodes.c b/gcc/tree-phinodes.c
index 8baf17a73a0..dcf4ba078ab 100644
--- a/gcc/tree-phinodes.c
+++ b/gcc/tree-phinodes.c
@@ -402,7 +402,7 @@ remove_phi_args (edge e)
    used as the node immediately before PHI in the linked list.  */
 
 void
-remove_phi_node (tree phi, tree prev, basic_block bb)
+remove_phi_node (tree phi, tree prev)
 {
   tree *loc;
 
@@ -412,7 +412,7 @@ remove_phi_node (tree phi, tree prev, basic_block bb)
     }
   else
     {
-      for (loc = &(bb_ann (bb)->phi_nodes);
+      for (loc = &(bb_ann (bb_for_stmt (phi))->phi_nodes);
 	   *loc != phi;
 	   loc = &PHI_CHAIN (*loc))
 	;
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index 69408e8cd7d..6920ee101ae 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -684,7 +684,7 @@ remove_dead_phis (basic_block bb)
 	      fprintf (dump_file, "\n");
 	    }
 
-	  remove_phi_node (phi, prev, bb);
+	  remove_phi_node (phi, prev);
 	  stats.removed_phis++;
 	  phi = next;
 	}
diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index b1636a7ffe9..44314615646 100644
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -4652,7 +4652,7 @@ remove_statement (tree stmt, bool including_defined_name)
 	  /* Prevent the ssa name defined by the statement from being removed.  */
 	  SET_PHI_RESULT (stmt, NULL);
 	}
-      remove_phi_node (stmt, NULL_TREE, bb_for_stmt (stmt));
+      remove_phi_node (stmt, NULL_TREE);
     }
   else
     {
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 66e2b223ce3..f4488a72dc8 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -2106,7 +2106,7 @@ remove_dead_inserted_code (void)
 	    }
 	  if (TREE_CODE (t) == PHI_NODE)
 	    {
-	      remove_phi_node (t, NULL, bb_for_stmt (t));
+	      remove_phi_node (t, NULL);
 	    }
 	  else
 	    {
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index 99b9627c207..91e28d6a499 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -1288,7 +1288,7 @@ kill_redundant_phi_nodes (void)
       if (repl != ssa_name (i))
 	{
 	  stmt = SSA_NAME_DEF_STMT (ssa_name (i));
-	  remove_phi_node (stmt, NULL_TREE, bb_for_stmt (stmt));
+	  remove_phi_node (stmt, NULL_TREE);
 	}
     }