From bca4942d92a1fb611272767277ae10135cb476d0 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Thu, 2 Jan 2014 13:42:27 -0500 Subject: [PATCH 058/159] FIXME: cfgcleanup.c --- gcc/cfgcleanup.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c index 6d87f3d..2e85f7d 100644 --- a/gcc/cfgcleanup.c +++ b/gcc/cfgcleanup.c @@ -114,7 +114,7 @@ try_simplify_condjump (basic_block cbranch_block) { basic_block jump_block, jump_dest_block, cbranch_dest_block; edge cbranch_jump_edge, cbranch_fallthru_edge; - rtx cbranch_insn; + rtx_base_insn cbranch_insn; /* Verify that there are exactly two successors. */ if (EDGE_COUNT (cbranch_block->succs) != 2) @@ -264,7 +264,8 @@ mentions_nonequal_regs (rtx *x, void *data) static edge thread_jump (edge e, basic_block b) { - rtx set1, set2, cond1, cond2, insn; + rtx set1, set2, cond1, cond2; + rtx_base_insn insn; enum rtx_code code1, code2, reversed_code2; bool reverse1 = false; unsigned i; @@ -2959,7 +2960,7 @@ delete_dead_jumptables (void) between two adjacent basic blocks. */ FOR_EACH_BB (bb) { - rtx insn, next; + rtx_base_insn insn, next; for (insn = NEXT_INSN (BB_END (bb)); insn && !NOTE_INSN_BASIC_BLOCK_P (insn); @@ -2970,7 +2971,7 @@ delete_dead_jumptables (void) && LABEL_NUSES (insn) == LABEL_PRESERVE_P (insn) && JUMP_TABLE_DATA_P (next)) { - rtx label = insn, jump = next; + rtx_base_insn label = insn, jump = next; if (dump_file) fprintf (dump_file, "Dead jumptable %i removed\n", -- 1.7.11.7