diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2014-05-14 10:36:23 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2014-05-14 10:36:23 +0000 |
| commit | 8a829274db9c7d33a7d14409e0bb09a98e213c98 (patch) | |
| tree | e17234d018b48620594f0fe21d40d1e47c16955d /gcc | |
| parent | 112903088c98fc1995fbfbcaa1b86234b535b8b4 (diff) | |
| download | gcc-8a829274db9c7d33a7d14409e0bb09a98e213c98.zip gcc-8a829274db9c7d33a7d14409e0bb09a98e213c98.tar.gz gcc-8a829274db9c7d33a7d14409e0bb09a98e213c98.tar.bz2 | |
cfgcleanup.c (try_forward_edges): Use location_t for locations.
* cfgcleanup.c (try_forward_edges): Use location_t for locations.
* cfgrtl.c (rtl_merge_blocks): Fix comment.
(cfg_layout_merge_blocks): Likewise.
* except.c (emit_to_new_bb_before): Remove prev_bb local variable.
From-SVN: r210416
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cfgcleanup.c | 7 | ||||
| -rw-r--r-- | gcc/cfgrtl.c | 4 | ||||
| -rw-r--r-- | gcc/except.c | 5 |
4 files changed, 15 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c63b0b9..b4054c2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-05-14 Eric Botcazou <ebotcazou@adacore.com> + + * cfgcleanup.c (try_forward_edges): Use location_t for locations. + * cfgrtl.c (rtl_merge_blocks): Fix comment. + (cfg_layout_merge_blocks): Likewise. + * except.c (emit_to_new_bb_before): Remove prev_bb local variable. + 2014-05-14 Andrey Belevantsev <abel@ispras.ru> PR rtl-optimization/60901 diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c index caa4c5f..2912176 100644 --- a/gcc/cfgcleanup.c +++ b/gcc/cfgcleanup.c @@ -425,7 +425,8 @@ try_forward_edges (int mode, basic_block b) for (ei = ei_start (b->succs); (e = ei_safe_edge (ei)); ) { basic_block target, first; - int counter, goto_locus; + location_t goto_locus; + int counter; bool threaded = false; int nthreaded_edges = 0; bool may_thread = first_pass || (b->flags & BB_MODIFIED) != 0; @@ -477,8 +478,8 @@ try_forward_edges (int mode, basic_block b) { /* When not optimizing, ensure that edges or forwarder blocks with different locus are not optimized out. */ - int new_locus = single_succ_edge (target)->goto_locus; - int locus = goto_locus; + location_t new_locus = single_succ_edge (target)->goto_locus; + location_t locus = goto_locus; if (new_locus != UNKNOWN_LOCATION && locus != UNKNOWN_LOCATION diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 5dd27d2..555fdf9 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -889,7 +889,7 @@ rtl_merge_blocks (basic_block a, basic_block b) BB_HEAD (b) = b_empty ? NULL_RTX : b_head; delete_insn_chain (del_first, del_last, true); - /* When not optimizing CFG and the edge is the only place in RTL which holds + /* When not optimizing and the edge is the only place in RTL which holds some unique locus, emit a nop with that locus in between. */ if (!optimize) { @@ -4564,7 +4564,7 @@ cfg_layout_merge_blocks (basic_block a, basic_block b) try_redirect_by_replacing_jump (EDGE_SUCC (a, 0), b, true); gcc_assert (!JUMP_P (BB_END (a))); - /* When not optimizing CFG and the edge is the only place in RTL which holds + /* When not optimizing and the edge is the only place in RTL which holds some unique locus, emit a nop with that locus in between. */ if (!optimize) emit_nop_for_unique_locus_between (a, b); diff --git a/gcc/except.c b/gcc/except.c index 5b33c9c..dff0ade 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -949,7 +949,7 @@ static basic_block emit_to_new_bb_before (rtx seq, rtx insn) { rtx last; - basic_block bb, prev_bb; + basic_block bb; edge e; edge_iterator ei; @@ -964,8 +964,7 @@ emit_to_new_bb_before (rtx seq, rtx insn) last = emit_insn_before (seq, insn); if (BARRIER_P (last)) last = PREV_INSN (last); - prev_bb = BLOCK_FOR_INSN (insn)->prev_bb; - bb = create_basic_block (seq, last, prev_bb); + bb = create_basic_block (seq, last, BLOCK_FOR_INSN (insn)->prev_bb); update_bb_for_insn (bb); bb->flags |= BB_SUPERBLOCK; return bb; |