diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1eaf99a2b952..de1aaa9677d0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-25  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* tree-ssa-forwprop.c (substitute_single_use_vars): Remove
+	duplicate code.
+
 2004-11-25  Andrew Pinski <pinskia@physics.uc.edu>
 
 	* bitmap.h (BITMAP_XMALLOC): Use BITMAP_ALLOC and not
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index cbf1fdec5784..b13894e42fc1 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -329,7 +329,6 @@ substitute_single_use_vars (varray_type *cond_worklist,
       tree def = SSA_NAME_DEF_STMT (test_var);
       dataflow_t df;
       int j, num_uses, propagated_uses;
-      block_stmt_iterator bsi;
 
       VARRAY_POP (vars_worklist);
 
@@ -466,16 +465,10 @@ substitute_single_use_vars (varray_type *cond_worklist,
 	 Unfortunately, we have to find the defining statement in
 	 whatever block it might be in.  */
       if (num_uses && num_uses == propagated_uses)
-	for (bsi = bsi_start (bb_for_stmt (def));
-	     !bsi_end_p (bsi);
-	     bsi_next (&bsi))
-	  {
-	    if (def == bsi_stmt (bsi))
-	      {
-		bsi_remove (&bsi);
-		break;
-	      }
-	  }
+	{
+	  block_stmt_iterator bsi = bsi_for_stmt (def);
+	  bsi_remove (&bsi);
+	}
     }
 }