combine.c (update_cfg_for_uncondjump): Instead of testing at_end assert it is always...

	* 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.

From-SVN: r172329

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f640b288cdba8a056d9d42df73f60f35bb64a7c5..96f542caea66e3d78461e5a61fe3816ba38d33b1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
 2011-04-12  Nicola Pero  <nicola.pero@meta-innovation.com>
 
        * c-parser.c (c_lex_one_token): Rewritten conditional used when

diff --git a/gcc/combine.c b/gcc/combine.c
index 23015fd9e6e0c9b90668f576448934c78b804ba5..766118d668fa4d71e2147fd5b2a94054e1dabfe4 100644 (file)
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -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 i0, int *new_direct_jump_p,
 
   /* 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 i0, int *new_direct_jump_p,
     }
 
   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)