diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 01dea5c57192769ca72a1cab6cb48f4f55b04591..b29c3f3cd774cea691a6e6c710b34a55250394ba 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-28  Jan Hubicka  <jh@suse.cz>
+
+	* gcse.c (bypass_block): Prevent edges to be unified when we are
+	about to emit compenstation code.
+
 2004-01-28  Nick Clifton  <nickc@redhat.com>
 
 	* config/arm/arm.c (arm_expand_builtin): Force second argument of
diff --git a/gcc/gcse.c b/gcc/gcse.c
index 509d465b40668fbd06abfda6728e8936a4f8d9a1..c2d7d5fb8414dd1c57b7489935b5611531d66901 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -4874,6 +4874,21 @@ bypass_block (basic_block bb, rtx setcc, rtx jump)
 	  else
 	    dest = NULL;
 
+	  /* Avoid unification of the edge with other edges from original
+	     branch.  We would end up emitting the instruction on "both"
+	     edges.  */
+	    
+	  if (dest && setcc && !CC0_P (SET_DEST (pat)))
+	    {
+	      edge e2;
+	      for (e2 = e->src->succ; e2; e2 = e2->succ_next)
+		if (e2->dest == dest)
+		  {
+		    dest = NULL;
+		    break;
+		  }
+	    }
+
 	  old_dest = e->dest;
 	  if (dest != NULL
 	      && dest != old_dest