From 0db79c887bced7fe95f4c5380dff4bed598f416d Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 8 Jan 2014 11:39:40 -0500 Subject: [PATCH 092/159] FIXME: final.c --- gcc/final.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gcc/final.c b/gcc/final.c index cc5bc48..0cd8bfa 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -117,7 +117,7 @@ along with GCC; see the file COPYING3. If not see #define SEEN_EMITTED 4 /* Last insn processed by final_scan_insn. */ -static rtx debug_insn; +static rtx_base_insn debug_insn; rtx current_output_insn; /* Line number of last NOTE. */ @@ -1603,9 +1603,9 @@ choose_inner_scope (tree s1, tree s2) /* Emit lexical block notes needed to change scope from S1 to S2. */ static void -change_scope (rtx orig_insn, tree s1, tree s2) +change_scope (rtx_base_insn orig_insn, tree s1, tree s2) { - rtx insn = orig_insn; + rtx_base_insn insn = orig_insn; tree com = NULL_TREE; tree ts1 = s1, ts2 = s2; tree s; @@ -1907,7 +1907,8 @@ final_end_function (void) output file, and INSN is the instruction being emitted. */ static void -dump_basic_block_info (FILE *file, rtx insn, basic_block *start_to_bb, +dump_basic_block_info (FILE *file, rtx_base_insn insn, + basic_block *start_to_bb, basic_block *end_to_bb, int bb_map_size, int *bb_seqn) { basic_block bb; @@ -2093,7 +2094,7 @@ output_alternate_entry_point (FILE *file, rtx insn) /* Given a CALL_INSN, find and return the nested CALL. */ static rtx -call_from_call_insn (rtx insn) +call_from_call_insn (rtx_call_insn insn) { rtx x; gcc_assert (CALL_P (insn)); @@ -2984,7 +2985,7 @@ final_scan_insn (rtx_base_insn insn, FILE *file, if (CALL_P (insn)) { - rtx x = call_from_call_insn (insn); + rtx x = call_from_call_insn (insn->as_an_rtx_call_insn ()); x = XEXP (x, 0); if (x && MEM_P (x) && GET_CODE (XEXP (x, 0)) == SYMBOL_REF) { @@ -4577,7 +4578,7 @@ make_pass_shorten_branches (gcc::context *ctxt) static unsigned int rest_of_clean_state (void) { - rtx insn, next; + rtx_base_insn insn, next; FILE *final_output = NULL; int save_unnumbered = flag_dump_unnumbered; int save_noaddr = flag_dump_noaddr; -- 1.7.11.7