From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 16 Oct 2014 10:13:52 +0000 (+0000)
Subject: 2014-10-16  Richard Biener  <rguenther@suse.de>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc8021097ec7542658f7b035604de66387c3d50e;p=thirdparty%2Fgcc.git

2014-10-16  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/63168
	* tree-cfg.c (gimple_can_merge_blocks_p): Only protect
	latches if after merging they are no longer simple.
	* cfghooks.c (merge_blocks): Handle merging a latch block
	into another block.

	* gcc.dg/tree-ssa/loop-40.c: New testcase.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216304 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 349b3037d0d4..d38d62ae4057 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2014-10-16  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/63168
+	* tree-cfg.c (gimple_can_merge_blocks_p): Only protect
+	latches if after merging they are no longer simple.
+	* cfghooks.c (merge_blocks): Handle merging a latch block
+	into another block.
+
 2014-10-16  Alexander Ivchenko  <alexander.ivchenko@intel.com>
 	    Maxim Kuznetsov  <maxim.kuznetsov@intel.com>
 	    Anna Tikhonova  <anna.tikhonova@intel.com>
diff --git a/gcc/cfghooks.c b/gcc/cfghooks.c
index fa18214e1ff4..09c7f6d6fe29 100644
--- a/gcc/cfghooks.c
+++ b/gcc/cfghooks.c
@@ -766,6 +766,11 @@ merge_blocks (basic_block a, basic_block b)
 	  add_bb_to_loop  (a, b->loop_father);
 	  a->loop_father->header = a;
 	}
+      /* If we merge a loop latch into its predecessor, update the loop
+         structure.  */
+      if (b->loop_father->latch
+	  && b->loop_father->latch == b)
+	b->loop_father->latch = a;
       remove_bb_from_loops (b);
     }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b283b9462fe0..e281e8c9bb9e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-16  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/63168
+	* gcc.dg/tree-ssa/loop-40.c: New testcase.
+
 2014-10-16  Andreas Schwab  <schwab@suse.de>
 
 	* gcc.target/m68k/crash1.c: Fix implicit declaration.
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-40.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-40.c
new file mode 100644
index 000000000000..803e5b61e798
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-40.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-ch-details" } */
+
+int mymax2(int *it, int *end)
+{
+  int max = *it;
+  while (++it != end)
+    if (*it > max)
+      max = *it;
+  return max;
+}
+
+/* { dg-final { scan-tree-dump "Duplicating header" "ch" } } */
+/* { dg-final { cleanup-tree-dump "ch" } } */
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index cdab6391bd32..ff72601b244a 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -1674,8 +1674,12 @@ gimple_can_merge_blocks_p (basic_block a, basic_block b)
 	return false;
     }
 
-  /* Protect the loop latches.  */
-  if (current_loops && b->loop_father->latch == b)
+  /* Protect simple loop latches.  We only want to avoid merging
+     the latch with the loop header in this case.  */
+  if (current_loops
+      && b->loop_father->latch == b
+      && loops_state_satisfies_p (LOOPS_HAVE_SIMPLE_LATCHES)
+      && b->loop_father->header == a)
     return false;
 
   /* It must be possible to eliminate all phi nodes in B.  If ssa form