Re: [PATCH, PR43920, 3/9] Cleanup.

[Tom de Vries <vries@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 340 bytes --]

On 04/01/2011 05:01 PM, Jakub Jelinek wrote:
> On Fri, Apr 01, 2011 at 04:56:10PM +0200, Tom de Vries wrote:
>> Reposting, with ChangeLog.
>
> Similarly one of your patches had
> 	* gcc/cfgcleanup.c (whatever): Whatever.
> in the ChangeLog, should be just
> 	* cfgcleanup.c (whatever): Whatever.
>
> 	Jakub

Fixed ChangeLog.

Thanks,
- Tom

[-- Attachment #2: 3_crossjump-cleanup-ml.patch --]
[-- Type: text/x-patch, Size: 1401 bytes --]

2011-04-01  Tom de Vries  <tom@codesourcery.com>

	PR target/43920
	* cfgcleanup.c (try_crossjump_bb): Remove 2 superfluous variables.

diff -u gcc/cfgcleanup.c gcc/cfgcleanup.c
--- gcc/cfgcleanup.c	(working copy)
+++ gcc/cfgcleanup.c	(working copy)
@@ -1961,7 +1961,6 @@
   edge e, e2, fallthru;
   bool changed;
   unsigned max, ix, ix2;
-  basic_block ev, ev2;
 
   /* Nothing to do if there is not at least two incoming edges.  */
   if (EDGE_COUNT (bb->preds) < 2)
@@ -2001,9 +2000,9 @@
   fallthru = find_fallthru_edge (bb->preds);
 
   changed = false;
-  for (ix = 0, ev = bb; ix < EDGE_COUNT (ev->preds); )
+  for (ix = 0; ix < EDGE_COUNT (bb->preds);)
     {
-      e = EDGE_PRED (ev, ix);
+      e = EDGE_PRED (bb, ix);
       ix++;
 
       /* As noted above, first try with the fallthru predecessor (or, a
@@ -2021,7 +2020,6 @@
 	    {
 	      changed = true;
 	      ix = 0;
-	      ev = bb;
 	      continue;
 	    }
 	}
@@ -2045,10 +2043,9 @@
       if (EDGE_SUCC (e->src, 0) != e)
 	continue;
 
-      for (ix2 = 0, ev2 = bb; ix2 < EDGE_COUNT (ev2->preds); )
+      for (ix2 = 0; ix2 < EDGE_COUNT (bb->preds); ix2++)
 	{
-	  e2 = EDGE_PRED (ev2, ix2);
-	  ix2++;
+	  e2 = EDGE_PRED (bb, ix2);
 
 	  if (e2 == e)
 	    continue;
@@ -2071,7 +2068,6 @@
 	  if (try_crossjump_to_edge (mode, e, e2))
 	    {
 	      changed = true;
-	      ev2 = bb;
 	      ix = 0;
 	      break;
 	    }