From 08c13199cf5568393fd46481d99cf1729480548a Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Fri, 5 Sep 2014 09:17:49 +0000 Subject: cfgloop.c (mark_loop_for_removal): New function. 2014-09-05 Richard Biener * cfgloop.c (mark_loop_for_removal): New function. * cfgloop.h (mark_loop_for_removal): Declare. * cfghooks.c (delete_basic_block): Use mark_loop_for_removal. (merge_blocks): Likewise. (duplicate_block): Likewise. * except.c (sjlj_emit_dispatch_table): Likewise. * tree-eh.c (cleanup_empty_eh_merge_phis): Likewise. * tree-ssa-threadupdate.c (ssa_redirect_edges): Likewise. (thread_through_loop_header): Likewise. From-SVN: r214942 --- gcc/tree-eh.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gcc/tree-eh.c') diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c index 9da8da2..d803253 100644 --- a/gcc/tree-eh.c +++ b/gcc/tree-eh.c @@ -4171,10 +4171,9 @@ cleanup_empty_eh_merge_phis (basic_block new_bb, basic_block old_bb, and mark the other loop as possibly having multiple latches. */ if (e->dest == e->dest->loop_father->header) { - e->dest->loop_father->header = NULL; - e->dest->loop_father->latch = NULL; + mark_loop_for_removal (e->dest->loop_father); new_bb->loop_father->latch = NULL; - loops_state_set (LOOPS_NEED_FIXUP|LOOPS_MAY_HAVE_MULTIPLE_LATCHES); + loops_state_set (LOOPS_MAY_HAVE_MULTIPLE_LATCHES); } redirect_eh_edge_1 (e, new_bb, change_region); redirect_edge_succ (e, new_bb); -- cgit v1.1