From e67d1102e0d55effe57427369957351d206f6475 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Sat, 6 Jun 2015 13:14:45 +0000 Subject: emit-rtl.c, [...]: Replace rtx base types with more derived ones. gcc/ * emit-rtl.c, expr.c, gcse.c, optabs.c, optabs.h, print-rtl.c, rtl.h, bb-reorder.c, builtins.c, calls.c, cfgbuild.c, cfgexpand.c, cfgrtl.c, cilk-common.c, config/i386/i386.md, cse.c, dwarf2cfi.c, except.c, final.c, function.c, gcse-common.c, genemit.c, haifa-sched.c, ifcvt.c, jump.c, loop-invariant.c, loop-iv.c, lra-constraints.c, lra.c, reload1.c, resource.c, rtlanal.c, sched-deps.c, sched-ebb.c, sel-sched-ir.c, sel-sched.c, shrink-wrap.c, stmt.c, store-motion.c: Replace rtx base types with more derived ones. From-SVN: r224187 --- gcc/ifcvt.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gcc/ifcvt.c') diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index 1e6c9cf..f3616d7 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -3767,7 +3767,7 @@ find_cond_trap (basic_block test_bb, edge then_edge, edge else_edge) basic_block else_bb = else_edge->dest; basic_block other_bb, trap_bb; rtx_insn *trap, *jump; - rtx cond, seq; + rtx cond; rtx_insn *cond_earliest; enum rtx_code code; @@ -3812,9 +3812,9 @@ find_cond_trap (basic_block test_bb, edge then_edge, edge else_edge) } /* Attempt to generate the conditional trap. */ - seq = gen_cond_trap (code, copy_rtx (XEXP (cond, 0)), - copy_rtx (XEXP (cond, 1)), - TRAP_CODE (PATTERN (trap))); + rtx_insn *seq = gen_cond_trap (code, copy_rtx (XEXP (cond, 0)), + copy_rtx (XEXP (cond, 1)), + TRAP_CODE (PATTERN (trap))); if (seq == NULL) return FALSE; @@ -3839,10 +3839,9 @@ find_cond_trap (basic_block test_bb, edge then_edge, edge else_edge) else if (trap_bb == then_bb) { rtx lab; - rtx_insn *newjump; lab = JUMP_LABEL (jump); - newjump = emit_jump_insn_after (gen_jump (lab), jump); + rtx_jump_insn *newjump = emit_jump_insn_after (gen_jump (lab), jump); LABEL_NUSES (lab) += 1; JUMP_LABEL (newjump) = lab; emit_barrier_after (newjump); -- cgit v1.1