gcc/ * rtl.h (tablejump_p): Strengthen first param from const_rtx to const rtx_insn *. (label_is_jump_target_p): Likewise for second param.
* rtlanal.c (tablejump_p): Likewise for param "insn". (label_is_jump_target_p): Likewise for param "jump_insn". --- gcc/rtl.h | 4 ++-- gcc/rtlanal.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/rtl.h b/gcc/rtl.h index 8f8d7f0..c38eb58 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -2787,7 +2787,7 @@ extern int inequality_comparisons_p (const_rtx); extern rtx replace_rtx (rtx, rtx, rtx); extern int replace_label (rtx *, void *); extern int rtx_referenced_p (rtx, rtx); -extern bool tablejump_p (const_rtx, rtx *, rtx_jump_table_data **); +extern bool tablejump_p (const rtx_insn *, rtx *, rtx_jump_table_data **); extern int computed_jump_p (const_rtx); typedef int (*rtx_function) (rtx *, void *); @@ -2822,7 +2822,7 @@ extern void remove_node_from_expr_list (const_rtx, rtx_expr_list **); extern int loc_mentioned_in_p (rtx *, const_rtx); extern rtx_insn *find_first_parameter_load (rtx_insn *, rtx_insn *); extern bool keep_with_call_p (const_rtx); -extern bool label_is_jump_target_p (const_rtx, const_rtx); +extern bool label_is_jump_target_p (const_rtx, const rtx_insn *); extern int insn_rtx_cost (rtx, bool); /* Given an insn and condition, return a canonical description of diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c index df2f734..5b1e600 100644 --- a/gcc/rtlanal.c +++ b/gcc/rtlanal.c @@ -2732,7 +2732,7 @@ rtx_referenced_p (rtx x, rtx body) *LABELP and the jump table to *TABLEP. LABELP and TABLEP may be NULL. */ bool -tablejump_p (const_rtx insn, rtx *labelp, rtx_jump_table_data **tablep) +tablejump_p (const rtx_insn *insn, rtx *labelp, rtx_jump_table_data **tablep) { rtx label, table; @@ -3746,7 +3746,7 @@ keep_with_call_p (const_rtx insn) not apply to the fallthru case of a conditional jump. */ bool -label_is_jump_target_p (const_rtx label, const_rtx jump_insn) +label_is_jump_target_p (const_rtx label, const rtx_insn *jump_insn) { rtx tmp = JUMP_LABEL (jump_insn); rtx_jump_table_data *table; -- 1.8.5.3