delete_related_insns returns an rtx_insn

2014-08-21  David Malcolm  <dmalcolm@redhat.com>

	* rtl.h (delete_related_insns): Strengthen return type from rtx to
	rtx_insn *.

	* jump.c (delete_related_insns): Likewise, also for locals "next"
	and "prev".

From-SVN: r214275

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 12ef5146eba98754a60cdf65f182887e2afd2473..4f840199a817afc9da6a878990e8b384fb18373d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2014-08-21  David Malcolm  <dmalcolm@redhat.com>
+
+       * rtl.h (delete_related_insns): Strengthen return type from rtx to
+       rtx_insn *.
+
+       * jump.c (delete_related_insns): Likewise, also for locals "next"
+       and "prev".
+
 2014-08-21  David Malcolm  <dmalcolm@redhat.com>
 
        * genautomata.c (output_internal_insn_latency_func): When writing

diff --git a/gcc/jump.c b/gcc/jump.c
index 96bdbe8ffbbbd2d4c202740e0526574f524397fe..b195b8544bb0b7beb46b2c08013c3eeb16a35c26 100644 (file)
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -1248,12 +1248,12 @@ mark_jump_label_asm (rtx asmop, rtx insn)
    Usage of this instruction is deprecated.  Use delete_insn instead and
    subsequent cfg_cleanup pass to delete unreachable code if needed.  */
 
-rtx
+rtx_insn *
 delete_related_insns (rtx insn)
 {
   int was_code_label = (LABEL_P (insn));
   rtx note;
-  rtx next = NEXT_INSN (insn), prev = PREV_INSN (insn);
+  rtx_insn *next = NEXT_INSN (insn), *prev = PREV_INSN (insn);
 
   while (next && INSN_DELETED_P (next))
     next = NEXT_INSN (next);

diff --git a/gcc/rtl.h b/gcc/rtl.h
index 7d31333c6bef27e97f873a31c9c01b9a3f4c3891..23446fcde03676f71fcda63c74d47604b58d213f 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2459,7 +2459,7 @@ extern enum rtx_code signed_condition (enum rtx_code);
 extern void mark_jump_label (rtx, rtx, int);
 
 /* In jump.c */
-extern rtx delete_related_insns (rtx);
+extern rtx_insn *delete_related_insns (rtx);
 
 /* In recog.c  */
 extern rtx *find_constant_term_loc (rtx *);