Message ID | 1407345815-14551-37-git-send-email-dmalcolm@redhat.com |
---|---|
State | New |
Headers | show |
On 08/06/14 11:20, David Malcolm wrote: > gcc/ > * basic-block.h (get_last_bb_insn): Strengthen return type from > rtx to rtx_insn *. > * cfgrtl.c (get_last_bb_insn): Likewise, and for locals "tmp" and > end". OK. jeff
On Wed, 2014-08-13 at 11:57 -0600, Jeff Law wrote: > On 08/06/14 11:20, David Malcolm wrote: > > gcc/ > > * basic-block.h (get_last_bb_insn): Strengthen return type from > > rtx to rtx_insn *. > > * cfgrtl.c (get_last_bb_insn): Likewise, and for locals "tmp" and > > end". > OK. Thanks. Committed to trunk as r214246 (having rerun bootstrap and regrtest).
diff --git a/gcc/basic-block.h b/gcc/basic-block.h index 03dbdbc..2eb6553 100644 --- a/gcc/basic-block.h +++ b/gcc/basic-block.h @@ -828,7 +828,7 @@ extern bool delete_unreachable_blocks (void); extern void update_br_prob_note (basic_block); extern bool inside_basic_block_p (const_rtx); extern bool control_flow_insn_p (const_rtx); -extern rtx get_last_bb_insn (basic_block); +extern rtx_insn *get_last_bb_insn (basic_block); /* In dominance.c */ diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 5611ab8..e3bad95 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -2238,12 +2238,12 @@ update_br_prob_note (basic_block bb) /* Get the last insn associated with block BB (that includes barriers and tablejumps after BB). */ -rtx +rtx_insn * get_last_bb_insn (basic_block bb) { rtx_jump_table_data *table; - rtx tmp; - rtx end = BB_END (bb); + rtx_insn *tmp; + rtx_insn *end = BB_END (bb); /* Include any jump table following the basic block. */ if (tablejump_p (end, NULL, &table))