diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2014-08-19 21:22:25 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2014-08-19 21:22:25 +0000 |
| commit | a90c614ae3ac7493224bdbdbea8b6fb396e6105e (patch) | |
| tree | f2f7bbfbf30255a19c41934caa81c9000b00c2a1 | |
| parent | 75b46023e7782781e63d0aca3c5b5f5ddd6cf816 (diff) | |
| download | gcc-a90c614ae3ac7493224bdbdbea8b6fb396e6105e.zip gcc-a90c614ae3ac7493224bdbdbea8b6fb396e6105e.tar.gz gcc-a90c614ae3ac7493224bdbdbea8b6fb396e6105e.tar.bz2 | |
Return types of unlink_insn_chain and duplicate_insn_chain
2014-08-19 David Malcolm <dmalcolm@redhat.com>
* rtl.h (unlink_insn_chain): Strengthen return type from rtx to
rtx_insn *.
(duplicate_insn_chain): Likewise.
* cfgrtl.c (unlink_insn_chain): Strengthen return type from rtx to
rtx_insn *, also for locals "prevfirst" and "nextlast". Add a
checked cast for now (until we can strengthen the params in the
same way).
(duplicate_insn_chain): Likewise.
From-SVN: r214197
| -rw-r--r-- | gcc/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/cfgrtl.c | 12 | ||||
| -rw-r--r-- | gcc/rtl.h | 4 |
3 files changed, 19 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ee05582..ef0673d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,16 @@ 2014-08-19 David Malcolm <dmalcolm@redhat.com> + * rtl.h (unlink_insn_chain): Strengthen return type from rtx to + rtx_insn *. + (duplicate_insn_chain): Likewise. + * cfgrtl.c (unlink_insn_chain): Strengthen return type from rtx to + rtx_insn *, also for locals "prevfirst" and "nextlast". Add a + checked cast for now (until we can strengthen the params in the + same way). + (duplicate_insn_chain): Likewise. + +2014-08-19 David Malcolm <dmalcolm@redhat.com> + * rtl.h (next_cc0_user): Strengthen return type from rtx to rtx_insn *. (prev_cc0_setter): Likewise. diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 902de13..9c115ba 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -3303,11 +3303,11 @@ fixup_abnormal_edges (void) /* Cut the insns from FIRST to LAST out of the insns stream. */ -rtx +rtx_insn * unlink_insn_chain (rtx first, rtx last) { - rtx prevfirst = PREV_INSN (first); - rtx nextlast = NEXT_INSN (last); + rtx_insn *prevfirst = PREV_INSN (first); + rtx_insn *nextlast = NEXT_INSN (last); SET_PREV_INSN (first) = NULL; SET_NEXT_INSN (last) = NULL; @@ -3319,7 +3319,7 @@ unlink_insn_chain (rtx first, rtx last) set_last_insn (prevfirst); if (!prevfirst) set_first_insn (nextlast); - return first; + return as_a <rtx_insn *> (first); } /* Skip over inter-block insns occurring after BB which are typically @@ -4080,7 +4080,7 @@ cfg_layout_can_duplicate_bb_p (const_basic_block bb) return true; } -rtx +rtx_insn * duplicate_insn_chain (rtx from, rtx to) { rtx insn, next, copy; @@ -4166,7 +4166,7 @@ duplicate_insn_chain (rtx from, rtx to) } insn = NEXT_INSN (last); delete_insn (last); - return insn; + return as_a <rtx_insn *> (insn); } /* Create a duplicate of the basic block BB. */ @@ -3099,7 +3099,7 @@ extern void delete_insn (rtx); extern rtx_insn *entry_of_function (void); extern void emit_insn_at_entry (rtx); extern void delete_insn_chain (rtx, rtx, bool); -extern rtx unlink_insn_chain (rtx, rtx); +extern rtx_insn *unlink_insn_chain (rtx, rtx); extern void delete_insn_and_edges (rtx); extern rtx gen_lowpart_SUBREG (enum machine_mode, rtx); extern rtx gen_const_mem (enum machine_mode, rtx); @@ -3175,7 +3175,7 @@ extern int fixup_args_size_notes (rtx, rtx, int); /* In cfgrtl.c */ extern void print_rtl_with_bb (FILE *, const_rtx, int); -extern rtx duplicate_insn_chain (rtx, rtx); +extern rtx_insn *duplicate_insn_chain (rtx, rtx); /* In expmed.c */ extern void init_expmed (void); |