summaryrefslogtreecommitdiff
path: root/gcc/cfgrtl.c
diff options
context:
space:
mode:
authorebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2014-05-14 10:36:23 +0000
committerebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2014-05-14 10:36:23 +0000
commit36ebb5b6eb1ba6fe982b810bd247ba141bfd06ed (patch)
treee17234d018b48620594f0fe21d40d1e47c16955d /gcc/cfgrtl.c
parenta509ca9d2e66e72532f1017d6259800cc39d423f (diff)
downloadgcc-36ebb5b6eb1ba6fe982b810bd247ba141bfd06ed.tar.gz
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210416 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cfgrtl.c')
-rw-r--r--gcc/cfgrtl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 5dd27d2795b..555fdf9ef15 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);