[PATCH] Don't update_cfg_for_uncondjump for noop non-jump moves

[Jakub Jelinek <jakub at redhat dot com>]

On Tue, Apr 12, 2011 at 09:18:01AM +0200, Eric Botcazou wrote:
> > The propagate_for_debug change alone could fix it, we should never
> > fall through into next basic block.  We are unforuntately not deleting
> > just jumps (which ought to appear at the end of bbs), but also
> > any other noop moves, which I think is unintentional, we have
> > delete_noop_moves that should clean that up instead (see the second patch).
> 
> Yes, I wondered several times about that.  This clearly looks unintentional and 
> I agree that it is worth fixing on the mainline, adding gcc_assert (at_end); to 
> update_cfg_for_uncondjump in the process.

Here is a patch, bootstrapped/regtested on x86_64-linux and i686-linux.
Ok for trunk?

2011-04-12  Jakub Jelinek  <jakub@redhat.com>

	* combine.c (update_cfg_for_uncondjump): Instead of testing at_end
	assert it is always true.
	(try_combine): Don't call update_cfg_for_uncondjump for noop non-jump
	moves.

--- gcc/combine.c.jj	2011-04-12 12:52:11.963669819 +0200
+++ gcc/combine.c	2011-04-12 16:31:57.059671430 +0200
@@ -2490,13 +2490,12 @@ static void
 update_cfg_for_uncondjump (rtx insn)
 {
   basic_block bb = BLOCK_FOR_INSN (insn);
-  bool at_end = (BB_END (bb) == insn);
+  gcc_assert (BB_END (bb) == insn);
 
-  if (at_end)
-    purge_dead_edges (bb);
+  purge_dead_edges (bb);
 
   delete_insn (insn);
-  if (at_end && EDGE_COUNT (bb->succs) == 1)
+  if (EDGE_COUNT (bb->succs) == 1)
     {
       rtx insn;
 
@@ -4409,7 +4408,8 @@ try_combine (rtx i3, rtx i2, rtx i1, rtx
 
   /* A noop might also need cleaning up of CFG, if it comes from the
      simplification of a jump.  */
-  if (GET_CODE (newpat) == SET
+  if (JUMP_P (i3)
+      && GET_CODE (newpat) == SET
       && SET_SRC (newpat) == pc_rtx
       && SET_DEST (newpat) == pc_rtx)
     {
@@ -4418,6 +4418,7 @@ try_combine (rtx i3, rtx i2, rtx i1, rtx
     }
 
   if (undobuf.other_insn != NULL_RTX
+      && JUMP_P (undobuf.other_insn)
       && GET_CODE (PATTERN (undobuf.other_insn)) == SET
       && SET_SRC (PATTERN (undobuf.other_insn)) == pc_rtx
       && SET_DEST (PATTERN (undobuf.other_insn)) == pc_rtx)


	Jakub