From dfe08bc4ef2810b98e0ce8ffca4155ad304e0429 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Fri, 21 Oct 2016 12:33:01 +0000 Subject: make tablejump_p return the label as a rtx_insn * gcc/ChangeLog: 2016-10-21 Trevor Saunders * cfgcleanup.c (merge_blocks_move_successor_nojumps): Adjust. (outgoing_edges_match): Likewise. (try_crossjump_to_edge): Likewise. * cfgrtl.c (try_redirect_by_replacing_jump): Likewise. (rtl_tidy_fallthru_edge): Likewise. * rtl.h (tablejump_p): Adjust prototype. * rtlanal.c (tablejump_p): Return the label as a rtx_insn *. From-SVN: r241402 --- gcc/cfgrtl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gcc/cfgrtl.c') diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 67cab71..813f7ce 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -1101,7 +1101,7 @@ try_redirect_by_replacing_jump (edge e, basic_block target, bool in_cfglayout) { rtx_code_label *target_label = block_label (target); rtx_insn *barrier; - rtx label; + rtx_insn *label; rtx_jump_table_data *table; emit_jump_insn_after_noloc (targetm.gen_jump (target_label), insn); @@ -1773,7 +1773,7 @@ rtl_tidy_fallthru_edge (edge e) && (any_uncondjump_p (q) || single_succ_p (b))) { - rtx label; + rtx_insn *label; rtx_jump_table_data *table; if (tablejump_p (q, &label, &table)) @@ -1786,8 +1786,7 @@ rtl_tidy_fallthru_edge (edge e) PUT_CODE (label, NOTE); NOTE_KIND (label) = NOTE_INSN_DELETED_LABEL; NOTE_DELETED_LABEL_NAME (label) = name; - rtx_insn *lab = safe_as_a (label); - reorder_insns (lab, lab, PREV_INSN (q)); + reorder_insns (label, label, PREV_INSN (q)); delete_insn (table); } -- cgit v1.1