Fix PR56035.

From-SVN: r195462

gcc/ChangeLog

+2013-01-25  Marek Polacek  <polacek@redhat.com>
+
+	PR tree-optimization/56035
+	* cfgloopmanip.c (fix_loop_structure): Remove redundant condition.
+
 2012-01-24  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/i386.md (*movti_internal_rex64): Add (o,e) alternative.

gcc/cfgloopmanip.c

@@ -1823,10 +1823,8 @@ fix_loop_structure (bitmap changed_bbs)
       /* If there was no latch, schedule the loop for removal.  */
       if (!first_latch)
 	loop->header = NULL;
-      /* If there was a single latch and it belongs to the loop of the
-	 header, record it.  */
-      else if (latch
-	       && latch->src->loop_father == loop)
+      /* If there was a single latch, record it.  */
+      else if (latch)
 	loop->latch = latch->src;
       /* Otherwise there are multiple latches which are eventually
          disambiguated below.  */

gcc/testsuite/ChangeLog

+2013-01-22  Marek Polacek  <polacek@redhat.com>
+
+	PR tree-optimization/56035
+	* gcc.dg/pr56035.c: New test.
+
 2013-01-24  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* gfortran.dg/bind_c_array_params_2.f90: Require -mno-relax-pic-calls

gcc/testsuite/gcc.dg/pr56035.c

+/* PR tree-optimization/56035 */
+/* { dg-do compile } */
+/* { dg-options "-O1 -ftree-vectorize -fcse-follow-jumps -fstrict-overflow" } */
+
+short a, c, *p;
+
+void
+f (void)
+{
+  int b;
+
+  if (c)
+  lbl1:
+    for (a = 0; a < 1; a++)
+      {
+	for (c = 0; c < 1; c++)
+	  {
+	    goto lbl1;
+	    while (*p++)
+	    lbl2:
+	      ;
+	  }
+      }
+
+  for (;; b++)
+    {
+      if (c)
+	goto lbl2;
+    lbl3:
+      for (c = 0; c < 9; c++)
+	for (c = -17; c < 2; c++)
+	  if (*p)
+	    goto lbl3;
+    }
+}