gcc/
* 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 *.
---
gcc/basic-block.h | 2 +-
gcc/cfgrtl.c | 4 ++--
gcc/sched-int.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 82dbfe9..87094c6 100644
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -798,7 +798,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 168a44a..ac3bc87 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -662,7 +662,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;
@@ -672,7 +672,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 3680889..7f236a1 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);
--
1.8.5.3
