diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bb0cf57e82c..497d43f7f25 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-22  Daniel Berlin <dberlin@dberlin.org>
+
+	Fix PR tree-optimization/17587
+	* tree-ssa-pre.c (fini_pre): Commit edge inserts here.
+	(insert_aux): Instead of here.
+
 2004-09-22  Diego Novillo  <dnovillo@redhat.com>
 
 	PR tree-optimization/16721
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 2c9b4ee5c5c..2408fff3279 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -1541,7 +1541,6 @@ insert_aux (basic_block block)
 									   eprime,
 									   stmts);
 				  bsi_insert_on_edge (pred, stmts);
-				  bsi_commit_edge_inserts (NULL);
 				  avail[bprime->index] = builtexpr;
 				}			      
 			    } 
@@ -1965,6 +1964,7 @@ static void
 fini_pre (void)
 {
   basic_block bb;
+  bsi_commit_edge_inserts (NULL);
 
   obstack_free (&grand_bitmap_obstack, NULL);
   free_alloc_pool (value_set_pool);