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/function.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) (limited to 'gcc/function.c') diff --git a/gcc/function.c b/gcc/function.c index 42774be..aec8af6 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -3109,8 +3109,8 @@ assign_parm_setup_reg (struct assign_parm_data_all *all, tree parm, } else t = op1; - rtx pat = gen_extend_insn (op0, t, promoted_nominal_mode, - data->passed_mode, unsignedp); + rtx_insn *pat = gen_extend_insn (op0, t, promoted_nominal_mode, + data->passed_mode, unsignedp); emit_insn (pat); insns = get_insns (); @@ -5290,8 +5290,6 @@ set_insn_locations (rtx_insn *insn, int loc) void expand_function_end (void) { - rtx clobber_after; - /* If arg_pointer_save_area was referenced only from a nested function, we will not have initialized it yet. Do that now. */ if (arg_pointer_save_area && ! crtl->arg_pointer_save_area_init) @@ -5340,7 +5338,7 @@ expand_function_end (void) We delay actual code generation after the current_function_value_rtx is computed. */ - clobber_after = get_last_insn (); + rtx_insn *clobber_after = get_last_insn (); /* Output the label for the actual return from the function. */ emit_label (return_label); @@ -5490,11 +5488,9 @@ expand_function_end (void) certainly doesn't fall thru into the exit block. */ if (!BARRIER_P (clobber_after)) { - rtx seq; - start_sequence (); clobber_return_register (); - seq = get_insns (); + rtx_insn *seq = get_insns (); end_sequence (); emit_insn_after (seq, clobber_after); @@ -5521,11 +5517,11 @@ expand_function_end (void) if (! EXIT_IGNORE_STACK && cfun->calls_alloca) { - rtx tem = 0, seq; + rtx tem = 0; start_sequence (); emit_stack_save (SAVE_FUNCTION, &tem); - seq = get_insns (); + rtx_insn *seq = get_insns (); end_sequence (); emit_insn_before (seq, parm_birth_insn); @@ -5552,15 +5548,13 @@ get_arg_pointer_save_area (void) if (! crtl->arg_pointer_save_area_init) { - rtx seq; - /* Save the arg pointer at the beginning of the function. The generated stack slot may not be a valid memory address, so we have to check it and fix it if necessary. */ start_sequence (); emit_move_insn (validize_mem (copy_rtx (ret)), crtl->args.internal_arg_pointer); - seq = get_insns (); + rtx_insn *seq = get_insns (); end_sequence (); push_topmost_sequence (); @@ -5653,13 +5647,11 @@ prologue_epilogue_contains (const_rtx insn) static void emit_use_return_register_into_block (basic_block bb) { - rtx seq; - rtx_insn *insn; start_sequence (); use_return_register (); - seq = get_insns (); + rtx_insn *seq = get_insns (); end_sequence (); - insn = BB_END (bb); + rtx_insn *insn = BB_END (bb); if (HAVE_cc0 && reg_mentioned_p (cc0_rtx, PATTERN (insn))) insn = prev_cc0_setter (insn); @@ -5686,9 +5678,9 @@ gen_return_pattern (bool simple_p) void emit_return_into_block (bool simple_p, basic_block bb) { - rtx jump, pat; - jump = emit_jump_insn_after (gen_return_pattern (simple_p), BB_END (bb)); - pat = PATTERN (jump); + rtx_jump_insn *jump = emit_jump_insn_after (gen_return_pattern (simple_p), + BB_END (bb)); + rtx pat = PATTERN (jump); if (GET_CODE (pat) == PARALLEL) pat = XVECEXP (pat, 0, 0); gcc_assert (ANY_RETURN_P (pat)); @@ -5733,7 +5725,6 @@ convert_jumps_to_returns (basic_block last_bb, bool simple_p, { int i; basic_block bb; - rtx label; edge_iterator ei; edge e; auto_vec src_bbs (EDGE_COUNT (last_bb->preds)); @@ -5742,7 +5733,7 @@ convert_jumps_to_returns (basic_block last_bb, bool simple_p, if (e->src != ENTRY_BLOCK_PTR_FOR_FN (cfun)) src_bbs.quick_push (e->src); - label = BB_HEAD (last_bb); + rtx_insn *label = BB_HEAD (last_bb); FOR_EACH_VEC_ELT (src_bbs, i, bb) { -- cgit v1.1