From: Richard Biener <rguenth@gcc.gnu.org>
Date: Fri, 14 Mar 2014 12:54:25 +0000 (+0000)
Subject: re PR ipa/60518 (ICE: in verify_loop_structure, at cfgloop.c:1647)
X-Git-Tag: releases/gcc-4.9.0~454
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f3388fec4997d12507ebe66f0b0487991f9895e;p=thirdparty%2Fgcc.git

re PR ipa/60518 (ICE: in verify_loop_structure, at cfgloop.c:1647)

2014-03-14  Richard Biener  <rguenther@suse.de>

	PR middle-end/60518
	* cfghooks.c (split_block): Properly adjust all loops the
	block was a latch of.

	* g++.dg/pr60518.C: New testcase.

From-SVN: r208567
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b2c7072cc204..95ae779284e9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,10 @@
-2014-03-13  Martin Jambor  <mjambor@suse.cz>
+2014-03-14  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/60518
+	* cfghooks.c (split_block): Properly adjust all loops the
+	block was a latch of.
+
+2014-03-14  Martin Jambor  <mjambor@suse.cz>
 
 	PR lto/60461
 	* ipa-prop.c (ipa_modify_call_arguments): Fix iteration condition
diff --git a/gcc/cfghooks.c b/gcc/cfghooks.c
index 7cf3cd50a669..bc1634aac879 100644
--- a/gcc/cfghooks.c
+++ b/gcc/cfghooks.c
@@ -510,9 +510,13 @@ split_block (basic_block bb, void *i)
 
   if (current_loops != NULL)
     {
+      edge_iterator ei;
+      edge e;
       add_bb_to_loop (new_bb, bb->loop_father);
-      if (bb->loop_father->latch == bb)
-	bb->loop_father->latch = new_bb;
+      /* Identify all loops bb may have been the latch of and adjust them.  */
+      FOR_EACH_EDGE (e, ei, new_bb->succs)
+	if (e->dest->loop_father->latch == bb)
+	  e->dest->loop_father->latch = new_bb;
     }
 
   res = make_single_succ_edge (bb, new_bb, EDGE_FALLTHRU);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7f7c9743567f..97e6bba73811 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,4 +1,9 @@
-2014-03-13  Martin Jambor  <mjambor@suse.cz>
+2014-03-14  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/60518
+	* g++.dg/pr60518.C: New testcase.
+
+2014-03-14  Martin Jambor  <mjambor@suse.cz>
 
 	PR lto/60461
 	* gcc.dg/lto/pr60461_0.c: New test.
diff --git a/gcc/testsuite/g++.dg/pr60518.C b/gcc/testsuite/g++.dg/pr60518.C
new file mode 100644
index 000000000000..e3da48a2ec90
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr60518.C
@@ -0,0 +1,13 @@
+// { dg-do compile }
+// { dg-options "-Os -fprofile-use" }
+
+int a;
+int fn1 () { return a == ',' || a == ';'; }
+
+void fn2 ()
+{
+    do
+          while (fn1 ())
+	          ;
+      while (1);
+}