diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cfghooks.c | 10 | ||||
| -rw-r--r-- | gcc/tree-cfgcleanup.c | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7bb9dc9..be93f5b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-08-05 Richard Biener <rguenther@suse.de> + + * tree-cfgcleanup.c (tree_forwarder_block_p): Use bb_loop_header_p. + * cfghooks.c (force_nonfallthru): If we ended up splitting a latch + adjust loop info accordingly. + 2016-08-05 Kugan Vivekanandarajah <kuganv@linaro.org> * tree-vrp.c (extract_range_basic): Check cfun->after_inlining diff --git a/gcc/cfghooks.c b/gcc/cfghooks.c index 06c05d1..4a6fcbf 100644 --- a/gcc/cfghooks.c +++ b/gcc/cfghooks.c @@ -1030,11 +1030,17 @@ force_nonfallthru (edge e) if (current_loops != NULL) { + basic_block pred = single_pred (ret); + basic_block succ = single_succ (ret); struct loop *loop - = find_common_loop (single_pred (ret)->loop_father, - single_succ (ret)->loop_father); + = find_common_loop (pred->loop_father, succ->loop_father); rescan_loop_exit (e, false, true); add_bb_to_loop (ret, loop); + + /* If we split the latch edge of loop adjust the latch block. */ + if (loop->latch == pred + && loop->header == succ) + loop->latch = ret; } } diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c index 4134c38..ab8a913 100644 --- a/gcc/tree-cfgcleanup.c +++ b/gcc/tree-cfgcleanup.c @@ -344,7 +344,7 @@ tree_forwarder_block_p (basic_block bb, bool phi_wanted) { basic_block dest; /* Protect loop headers. */ - if (bb->loop_father->header == bb) + if (bb_loop_header_p (bb)) return false; dest = EDGE_SUCC (bb, 0)->dest; |