From: David Malcolm <dmalcolm@redhat.com>
Date: Tue, 19 Aug 2014 19:43:08 +0000 (+0000)
Subject: bb_note returns a rtx_note *
X-Git-Tag: releases/gcc-5.1.0~5347
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed27099755a9d34005b616231546f5ed017c61b9;p=thirdparty%2Fgcc.git

bb_note returns a rtx_note *

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

	* basic-block.h (bb_note): Strengthen return type from rtx to
	rtx_note *.
	* sched-int.h (bb_note): Likewise.
	* cfgrtl.c (bb_note): Likewise.  Add a checked cast to rtx_note *.

From-SVN: r214188
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3b92fbf46ca7..c6b92873d803 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-19  David Malcolm  <dmalcolm@redhat.com>
+
+	* basic-block.h (bb_note): Strengthen return type from rtx to
+	rtx_note *.
+	* sched-int.h (bb_note): Likewise.
+	* cfgrtl.c (bb_note): Likewise.  Add a checked cast to rtx_note *.
+
 2014-08-19  David Malcolm  <dmalcolm@redhat.com>
 
 	* rtl.h (make_insn_raw): Strengthen return type from rtx to
diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index d6aebb45df71..518dce244793 100644
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -801,7 +801,7 @@ extern basic_block * single_pred_before_succ_order (void);
 
 /* In cfgrtl.c  */
 extern rtx block_label (basic_block);
-extern rtx bb_note (basic_block);
+extern rtx_note *bb_note (basic_block);
 extern bool purge_all_dead_edges (void);
 extern bool purge_dead_edges (basic_block);
 extern bool fixup_abnormal_edges (void);
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 5babdf9d15f8..c6176a5ba878 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -661,7 +661,7 @@ could_fall_through (basic_block src, basic_block target)
 }
 
 /* Return the NOTE_INSN_BASIC_BLOCK of BB.  */
-rtx
+rtx_note *
 bb_note (basic_block bb)
 {
   rtx note;
@@ -671,7 +671,7 @@ bb_note (basic_block bb)
     note = NEXT_INSN (note);
 
   gcc_assert (NOTE_INSN_BASIC_BLOCK_P (note));
-  return note;
+  return as_a <rtx_note *> (note);
 }
 
 /* Return the INSN immediately following the NOTE_INSN_BASIC_BLOCK
diff --git a/gcc/sched-int.h b/gcc/sched-int.h
index 3680889fff55..7f236a127d34 100644
--- a/gcc/sched-int.h
+++ b/gcc/sched-int.h
@@ -1368,7 +1368,7 @@ extern void sched_change_pattern (rtx, rtx);
 extern int sched_speculate_insn (rtx, ds_t, rtx *);
 extern void unlink_bb_notes (basic_block, basic_block);
 extern void add_block (basic_block, basic_block);
-extern rtx bb_note (basic_block);
+extern rtx_note *bb_note (basic_block);
 extern void concat_note_lists (rtx, rtx *);
 extern rtx sched_emit_insn (rtx);
 extern rtx get_ready_element (int);