From: David Malcolm <dmalcolm@redhat.com>
Date: Thu, 21 Aug 2014 15:00:09 +0000 (+0000)
Subject: delete_related_insns returns an rtx_insn
X-Git-Tag: releases/gcc-5.1.0~5293
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bba2490b5f78020a30391a6b37fb07710a32580e;p=thirdparty%2Fgcc.git

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 12ef5146eba9..4f840199a817 100644
--- 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 96bdbe8ffbbb..b195b8544bb0 100644
--- 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 7d31333c6bef..23446fcde036 100644
--- 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 *);