From eddb72800879448779cf944c65ef1be187da9be0 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 7 Jan 2014 16:32:59 -0500 Subject: [PATCH 087/159] FIXME bb-reorder.c --- gcc/bb-reorder.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c index 9bf06d5..67b8eca 100644 --- a/gcc/bb-reorder.c +++ b/gcc/bb-reorder.c @@ -1371,7 +1371,7 @@ int get_uncond_jump_length (void) { rtx_code_label label; - rtx jump; + rtx_base_insn jump; int length; label = (emit_label_before (gen_label_rtx (), @@ -1396,7 +1396,7 @@ fix_up_crossing_landing_pad (eh_landing_pad old_lp, basic_block old_bb) eh_landing_pad new_lp; basic_block new_bb, last_bb, post_bb; rtx_code_label new_label, post_label; - rtx jump; + rtx_base_insn jump; unsigned new_partition; edge_iterator ei; edge e; @@ -1437,7 +1437,7 @@ fix_up_crossing_landing_pad (eh_landing_pad old_lp, basic_block old_bb) for (ei = ei_start (old_bb->preds); (e = ei_safe_edge (ei)) != NULL; ) if (BB_PARTITION (e->src) == new_partition) { - rtx insn = BB_END (e->src); + rtx_base_insn insn = BB_END (e->src); rtx note = find_reg_note (insn, REG_EH_REGION, NULL_RTX); gcc_assert (note != NULL); @@ -1736,7 +1736,7 @@ add_labels_and_missing_jumps (vec crossing_edges) basic_block src = e->src; basic_block dest = e->dest; rtx_code_label label; - rtx new_jump; + rtx_jump_insn new_jump; if (dest == EXIT_BLOCK_PTR_FOR_FN (cfun)) continue; @@ -1793,7 +1793,7 @@ fix_up_fall_thru_edges (void) edge e; bool cond_jump_crosses; int invert_worked; - rtx old_jump; + rtx_base_insn old_jump; rtx_code_label fall_thru_label; FOR_EACH_BB (cur_bb) @@ -1991,7 +1991,7 @@ fix_crossing_conditional_branches (void) edge succ2; edge crossing_edge; edge new_edge; - rtx old_jump; + rtx_base_insn old_jump; rtx set_src; rtx old_label = NULL_RTX; rtx_code_label new_label; @@ -2058,7 +2058,7 @@ fix_crossing_conditional_branches (void) else { basic_block last_bb; - rtx new_jump; + rtx_base_insn new_jump; /* Create new basic block to be dest for conditional jump. */ @@ -2121,10 +2121,10 @@ fix_crossing_unconditional_branches (void) rtx_base_insn last_insn; rtx label; rtx label_addr; - rtx indirect_jump_sequence; - rtx jump_insn = NULL_RTX; + rtx_base_insn indirect_jump_sequence; + rtx_base_insn jump_insn = NULL_RTX_BASE_INSN; rtx new_reg; - rtx cur_insn; + rtx_base_insn cur_insn; edge succ; FOR_EACH_BB (cur_bb) -- 1.7.11.7