summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordmalcolm <dmalcolm@138bc75d-0d04-0410-961f-82ee72b054a4>2014-08-20 23:59:49 +0000
committerdmalcolm <dmalcolm@138bc75d-0d04-0410-961f-82ee72b054a4>2014-08-20 23:59:49 +0000
commit2d63955f9f7ea71a892d7b5790acdd52e2da37b2 (patch)
tree9d78187d83d43d9a43c42d7e64d27f6a07cccadd
parent399d4f804ba81fa2e05353243c52632f3f58ae54 (diff)
downloadgcc-2d63955f9f7ea71a892d7b5790acdd52e2da37b2.tar.gz
get_last_bb_insn returns an rtx_insn
2014-08-21 David Malcolm <dmalcolm@redhat.com> * 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". git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@214246 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/basic-block.h2
-rw-r--r--gcc/cfgrtl.c6
3 files changed, 11 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 03599dfff0e..d4537b55260 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-21 David Malcolm <dmalcolm@redhat.com>
+
+ * 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".
+
2014-08-21 Manuel López-Ibáñez <manu@gcc.gnu.org>
PR fortran/44054
diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 2e494a4995a..e3011da8fe3 100644
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -831,7 +831,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 fd94a03eed0..ec53f2e752c 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -2237,12 +2237,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))