flow.c (merge_blocks_nomove): For HAVE_cc0 targets...

�
        * flow.c (merge_blocks_nomove): For HAVE_cc0 targets, make sure
        to also delete the cc0 setter when deleting a conditional branch
        to the next block.

From-SVN: r25642

1 files changed, 13 insertions, 0 deletions

diff --git a/gcc/flow.c b/gcc/flow.c
index 5b72509..3b4ef6e 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -1821,7 +1821,20 @@ merge_blocks_nomove (a, b)
       else
 	{
 	  rtx tmp = a->end;
+
 	  a->end = prev_nonnote_insn (tmp);
+
+#ifdef HAVE_cc0
+	  /* If this was a conditional jump, we need to also delete
+	     the insn that set cc0.  */
+	  if (! simplejump_p (tmp) && condjump_p (tmp))
+	    {
+	      PUT_CODE (PREV_INSN (tmp), NOTE);
+	      NOTE_LINE_NUMBER (PREV_INSN (tmp)) = NOTE_INSN_DELETED;
+	      NOTE_SOURCE_FILE (PREV_INSN (tmp)) = 0;
+	    }
+#endif
+
 	  flow_delete_insn (tmp);
 	}
     }