From c5241a21a366ef5d9dc1dce486af5423e484a630 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Thu, 28 Aug 2014 20:51:33 +0000 Subject: [PATCH] tablejump_p takes an rtx_insn gcc/ 2014-08-28 David Malcolm * 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". From-SVN: r214696 --- gcc/ChangeLog | 18 ++++++++++++++++++ gcc/rtl.h | 4 ++-- gcc/rtlanal.c | 4 ++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bd0c89943fb..5bb35237189 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,21 @@ +2014-08-28 David Malcolm + + * 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". + +2014-08-28 David Malcolm + + * rtl.h (find_first_parameter_load): Strengthen return type and + both params from rtx to rtx_insn *. + * rtlanal.c (find_first_parameter_load): Strengthen return type, + both params and locals "before", "first_set" from rtx to + rtx_insn *. Remove now-redundant cast. + * except.c (sjlj_mark_call_sites): Use NULL rather than NULL_RTX. + 2014-08-28 David Malcolm * rtl.h (find_last_value): Delete. diff --git a/gcc/rtl.h b/gcc/rtl.h index 45cbe52070c..89431a933cb 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -2795,7 +2795,7 @@ extern rtx replace_rtx (rtx, rtx, rtx); extern void replace_label (rtx *, rtx, rtx, bool); extern void replace_label_in_insn (rtx_insn *, rtx, rtx, bool); extern bool rtx_referenced_p (const_rtx, const_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); extern bool tls_referenced_p (const_rtx); @@ -2831,7 +2831,7 @@ extern void remove_node_from_insn_list (const rtx_insn *, rtx_insn_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 76c4bf08c06..739f1343a1e 100644 --- a/gcc/rtlanal.c +++ b/gcc/rtlanal.c @@ -2862,7 +2862,7 @@ rtx_referenced_p (const_rtx x, const_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; @@ -3833,7 +3833,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; -- 2.30.2