diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ddbcfca99ab2..ad7c33f1c7fb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3,6 +3,9 @@
 	* tree-outof-ssa.c (coalesce_abnormal_edges): Use e->dest_idx
 	instead of calling phi_arg_from_edge.
 
+	* tree-phinodes.c (remove_phi_args): Replace phi_arg_from_edge
+	with e->dest_idx.
+
 2004-11-24  Ben Elliston  <bje@au.ibm.com>
 
 	* config/i386/i386.h (ASM_OUTPUT_DWARF_ADDR_CONST): Remove.
diff --git a/gcc/tree-phinodes.c b/gcc/tree-phinodes.c
index eec2fa3ed4fd..f566c808957d 100644
--- a/gcc/tree-phinodes.c
+++ b/gcc/tree-phinodes.c
@@ -395,11 +395,7 @@ remove_phi_args (edge e)
   tree phi;
 
   for (phi = phi_nodes (e->dest); phi; phi = PHI_CHAIN (phi))
-    {
-      int index = phi_arg_from_edge (phi, e);
-      if (index >= 0)
-	remove_phi_arg_num (phi, index);
-    }
+    remove_phi_arg_num (phi, e->dest_idx);
 }
 
 /* Remove PHI node PHI from basic block BB.  If PREV is non-NULL, it is