From: Eric Botcazou <ebotcazou@adacore.com>
Date: Wed, 11 May 2011 23:05:51 +0000 (+0000)
Subject: cfgrtl.c (commit_one_edge_insertion): Remove always-true test and reindent the subseq... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=898c90c0fd29b8f0f669ad7910fa5cdfd603900a;p=gcc.git

cfgrtl.c (commit_one_edge_insertion): Remove always-true test and reindent the subsequent block.

	* cfgrtl.c (commit_one_edge_insertion): Remove always-true test and
	reindent the subsequent block.

From-SVN: r173685
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fae9956804e..038bd095db8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-11  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* cfgrtl.c (commit_one_edge_insertion): Remove always-true test and
+	reindent the subsequent block.
+
 2011-05-11  Satoru Takabayashi  <satorux@google.com>
 	    Paul Pluzhnikov  <ppluzhnikov@google.com>
 
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index c450ca005a0..5bafc0f3c25 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -1465,80 +1465,76 @@ void
 commit_one_edge_insertion (edge e)
 {
   rtx before = NULL_RTX, after = NULL_RTX, insns, tmp, last;
-  basic_block bb = NULL;
+  basic_block bb;
 
   /* Pull the insns off the edge now since the edge might go away.  */
   insns = e->insns.r;
   e->insns.r = NULL_RTX;
 
-  if (!before && !after)
-    {
-      /* Figure out where to put these things.  If the destination has
-	 one predecessor, insert there.  Except for the exit block.  */
-      if (single_pred_p (e->dest) && e->dest != EXIT_BLOCK_PTR)
-	{
-	  bb = e->dest;
-
-	  /* Get the location correct wrt a code label, and "nice" wrt
-	     a basic block note, and before everything else.  */
-	  tmp = BB_HEAD (bb);
-	  if (LABEL_P (tmp))
-	    tmp = NEXT_INSN (tmp);
-	  if (NOTE_INSN_BASIC_BLOCK_P (tmp))
-	    tmp = NEXT_INSN (tmp);
-	  if (tmp == BB_HEAD (bb))
-	    before = tmp;
-	  else if (tmp)
-	    after = PREV_INSN (tmp);
-	  else
-	    after = get_last_insn ();
-	}
-
-      /* If the source has one successor and the edge is not abnormal,
-	 insert there.  Except for the entry block.  */
-      else if ((e->flags & EDGE_ABNORMAL) == 0
-	       && single_succ_p (e->src)
-	       && e->src != ENTRY_BLOCK_PTR)
-	{
-	  bb = e->src;
+  /* Figure out where to put these insns.  If the destination has
+     one predecessor, insert there.  Except for the exit block.  */
+  if (single_pred_p (e->dest) && e->dest != EXIT_BLOCK_PTR)
+    {
+      bb = e->dest;
+
+      /* Get the location correct wrt a code label, and "nice" wrt
+	 a basic block note, and before everything else.  */
+      tmp = BB_HEAD (bb);
+      if (LABEL_P (tmp))
+	tmp = NEXT_INSN (tmp);
+      if (NOTE_INSN_BASIC_BLOCK_P (tmp))
+	tmp = NEXT_INSN (tmp);
+      if (tmp == BB_HEAD (bb))
+	before = tmp;
+      else if (tmp)
+	after = PREV_INSN (tmp);
+      else
+	after = get_last_insn ();
+    }
 
-	  /* It is possible to have a non-simple jump here.  Consider a target
-	     where some forms of unconditional jumps clobber a register.  This
-	     happens on the fr30 for example.
+  /* If the source has one successor and the edge is not abnormal,
+     insert there.  Except for the entry block.  */
+  else if ((e->flags & EDGE_ABNORMAL) == 0
+	   && single_succ_p (e->src)
+	   && e->src != ENTRY_BLOCK_PTR)
+    {
+      bb = e->src;
 
-	     We know this block has a single successor, so we can just emit
-	     the queued insns before the jump.  */
-	  if (JUMP_P (BB_END (bb)))
-	    before = BB_END (bb);
-	  else
-	    {
-	      /* We'd better be fallthru, or we've lost track of
-		 what's what.  */
-	      gcc_assert (e->flags & EDGE_FALLTHRU);
+      /* It is possible to have a non-simple jump here.  Consider a target
+	 where some forms of unconditional jumps clobber a register.  This
+	 happens on the fr30 for example.
 
-	      after = BB_END (bb);
-	    }
-	}
-      /* Otherwise we must split the edge.  */
+	 We know this block has a single successor, so we can just emit
+	 the queued insns before the jump.  */
+      if (JUMP_P (BB_END (bb)))
+	before = BB_END (bb);
       else
 	{
-	  bb = split_edge (e);
-	  after = BB_END (bb);
+	  /* We'd better be fallthru, or we've lost track of what's what.  */
+	  gcc_assert (e->flags & EDGE_FALLTHRU);
 
-	  if (flag_reorder_blocks_and_partition
-	      && targetm.have_named_sections
-	      && e->src != ENTRY_BLOCK_PTR
-	      && BB_PARTITION (e->src) == BB_COLD_PARTITION
-	      && !(e->flags & EDGE_CROSSING)
-	      && JUMP_P (after)
-	      && !any_condjump_p (after)
-	      && (single_succ_edge (bb)->flags & EDGE_CROSSING))
-	    add_reg_note (after, REG_CROSSING_JUMP, NULL_RTX);
+	  after = BB_END (bb);
 	}
     }
 
-  /* Now that we've found the spot, do the insertion.  */
+  /* Otherwise we must split the edge.  */
+  else
+    {
+      bb = split_edge (e);
+      after = BB_END (bb);
+
+      if (flag_reorder_blocks_and_partition
+	  && targetm.have_named_sections
+	  && e->src != ENTRY_BLOCK_PTR
+	  && BB_PARTITION (e->src) == BB_COLD_PARTITION
+	  && !(e->flags & EDGE_CROSSING)
+	  && JUMP_P (after)
+	  && !any_condjump_p (after)
+	  && (single_succ_edge (bb)->flags & EDGE_CROSSING))
+	add_reg_note (after, REG_CROSSING_JUMP, NULL_RTX);
+    }
 
+  /* Now that we've found the spot, do the insertion.  */
   if (before)
     {
       emit_insn_before_noloc (insns, before, bb);