aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cfgexpand.c5
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/torture/pr80764.c14
4 files changed, 28 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 23f9b69..aae3fdd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-19 Richard Biener <rguenther@suse.de>
+
+ PR middle-end/80764
+ * cfgexpand.c (expand_gimple_cond): Fix loop fixup.
+
2017-05-18 Segher Boessenkool <segher@kernel.crashing.org>
* config/rs6000/rs6000.c (struct machine_function): Add field
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index e38c8e4..9965310 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -2503,7 +2503,10 @@ expand_gimple_cond (basic_block bb, gcond *stmt)
false_edge->flags |= EDGE_FALLTHRU;
new_bb->count = false_edge->count;
new_bb->frequency = EDGE_FREQUENCY (false_edge);
- add_bb_to_loop (new_bb, bb->loop_father);
+ add_bb_to_loop (new_bb, dest->loop_father);
+ if (bb->loop_father->latch == bb
+ && bb->loop_father->header == dest)
+ bb->loop_father->latch = new_bb;
new_edge = make_edge (new_bb, dest, 0);
new_edge->probability = REG_BR_PROB_BASE;
new_edge->count = new_bb->count;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c785b02..29a19cc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-19 Richard Biener <rguenther@suse.de>
+
+ PR middle-end/80764
+ * gcc.dg/torture/pr80764.c: New testcase.
+
2017-05-18 Michael Meissner <meissner@linux.vnet.ibm.com>
PR target/80510
diff --git a/gcc/testsuite/gcc.dg/torture/pr80764.c b/gcc/testsuite/gcc.dg/torture/pr80764.c
new file mode 100644
index 0000000..bc6d8e8
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr80764.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+
+int b, d, f, h;
+char e;
+int fn1();
+int main() { return fn1(); }
+int fn1(int p1) {
+ for (; d;)
+ for (; e < 3;) {
+ for (; h;)
+ b = fn1(0);
+ return f;
+ }
+}