diff options
-rw-r--r-- | gcc/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/tree-call-cdce.c | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8f4cc17..ab1622c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,11 @@ 2015-10-29 Richard Sandiford <richard.sandiford@arm.com> * tree-call-cdce.c (shrink_wrap_one_built_in_call): Remove + guard_bb0 and use guard_bb throughout. + +2015-10-29 Richard Sandiford <richard.sandiford@arm.com> + + * tree-call-cdce.c (shrink_wrap_one_built_in_call): Remove unnecessary label. 2015-10-29 Richard Biener <rguenther@suse.de> diff --git a/gcc/tree-call-cdce.c b/gcc/tree-call-cdce.c index 400ca16..57be8a4 100644 --- a/gcc/tree-call-cdce.c +++ b/gcc/tree-call-cdce.c @@ -717,7 +717,7 @@ static bool shrink_wrap_one_built_in_call (gcall *bi_call) { gimple_stmt_iterator bi_call_bsi; - basic_block bi_call_bb, join_tgt_bb, guard_bb, guard_bb0; + basic_block bi_call_bb, join_tgt_bb, guard_bb; edge join_tgt_in_edge_from_call, join_tgt_in_edge_fall_thru; edge bi_call_in_edge0, guard_bb_in_edge; unsigned tn_cond_stmts, nconds; @@ -775,22 +775,21 @@ shrink_wrap_one_built_in_call (gcall *bi_call) bi_call_in_edge0 = split_block (bi_call_bb, cond_expr); bi_call_in_edge0->flags &= ~EDGE_FALLTHRU; bi_call_in_edge0->flags |= EDGE_TRUE_VALUE; - guard_bb0 = bi_call_bb; + guard_bb = bi_call_bb; bi_call_bb = bi_call_in_edge0->dest; - join_tgt_in_edge_fall_thru = make_edge (guard_bb0, join_tgt_bb, + join_tgt_in_edge_fall_thru = make_edge (guard_bb, join_tgt_bb, EDGE_FALSE_VALUE); bi_call_in_edge0->probability = REG_BR_PROB_BASE * ERR_PROB; bi_call_in_edge0->count = - apply_probability (guard_bb0->count, + apply_probability (guard_bb->count, bi_call_in_edge0->probability); join_tgt_in_edge_fall_thru->probability = inverse_probability (bi_call_in_edge0->probability); join_tgt_in_edge_fall_thru->count = - guard_bb0->count - bi_call_in_edge0->count; + guard_bb->count - bi_call_in_edge0->count; /* Code generation for the rest of the conditions */ - guard_bb = guard_bb0; while (nconds > 0) { unsigned ci0; |