make delete_insn () take a rtx_insn *

gcc/ChangeLog:

2016-11-21  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>

	* cfgrtl.c (delete_insn): Change argument type to rtx_insn *.
	(fixup_reorder_chain): Adjust.
	* cfgrtl.h: Adjust prototype.

From-SVN: r242653

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 635f23c2e86b0f1fad162772c112893f380490c1..9b6ef79c701d9702d5ea465019868198474d5661 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-21  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+       * cfgrtl.c (delete_insn): Change argument type to rtx_insn *.
+       (fixup_reorder_chain): Adjust.
+       * cfgrtl.h: Adjust prototype.
+
 2016-11-21  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
        * rtl.h: Adjust prototype.

diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index d2719db00197bbd668584e2ff39721d0924fa4eb..d0aac094520736dca9469e0c5ee163b48494b3ce 100644 (file)
--- 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 <rtx_insn *> (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<rtx_insn *> (ret_label));
                  continue;
                }
            }

diff --git a/gcc/cfgrtl.h b/gcc/cfgrtl.h
index f4c139605a246bc6977356debd9bea9eaf4320fa..8e2c13cfc8fcb9efe08a7c775a42408c52e80aa6 100644 (file)
--- 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 *,