From a29f6a2be31ce70d96c1d9337a8b79bc19aca76b Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Mon, 21 Nov 2016 06:15:58 +0000 Subject: [PATCH] make delete_insn () take a rtx_insn * gcc/ChangeLog: 2016-11-21 Trevor Saunders * cfgrtl.c (delete_insn): Change argument type to rtx_insn *. (fixup_reorder_chain): Adjust. * cfgrtl.h: Adjust prototype. From-SVN: r242653 --- gcc/ChangeLog | 6 ++++++ gcc/cfgrtl.c | 5 ++--- gcc/cfgrtl.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 635f23c2e86..9b6ef79c701 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-11-21 Trevor Saunders + + * cfgrtl.c (delete_insn): Change argument type to rtx_insn *. + (fixup_reorder_chain): Adjust. + * cfgrtl.h: Adjust prototype. + 2016-11-21 Trevor Saunders * rtl.h: Adjust prototype. diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index d2719db0019..d0aac094520 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -123,9 +123,8 @@ can_delete_label_p (const rtx_code_label *label) /* Delete INSN by patching it out. */ void -delete_insn (rtx uncast_insn) +delete_insn (rtx_insn *insn) { - rtx_insn *insn = as_a (uncast_insn); rtx note; bool really_delete = true; @@ -3817,7 +3816,7 @@ fixup_reorder_chain (void) update_br_prob_note (bb); if (LABEL_NUSES (ret_label) == 0 && single_pred_p (e_taken->dest)) - delete_insn (ret_label); + delete_insn (as_a (ret_label)); continue; } } diff --git a/gcc/cfgrtl.h b/gcc/cfgrtl.h index f4c139605a2..8e2c13cfc8f 100644 --- a/gcc/cfgrtl.h +++ b/gcc/cfgrtl.h @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_CFGRTL_H #define GCC_CFGRTL_H -extern void delete_insn (rtx); +extern void delete_insn (rtx_insn *); extern bool delete_insn_and_edges (rtx_insn *); extern void delete_insn_chain (rtx, rtx_insn *, bool); extern basic_block create_basic_block_structure (rtx_insn *, rtx_insn *, -- 2.30.2