From 5de87675007e092047cd11e18d02bf791705cb2e Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 9 Jul 2014 17:03:33 -0400 Subject: [PATCH 076/205] FIXME: tweaks to final.c gcc/ * final.c (get_attr_length_1): Rename param "insn" to "uncast_insn", adding "insn" back in as an rtx_insn * with a checked cast, so that macro ADJUST_INSN_LENGTH can be passed an rtx_insn * as the first param. (final_scan_insn): "Likewise" for local "next". --- gcc/final.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc/final.c b/gcc/final.c index 4b698c2..22d75c3 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -373,8 +373,9 @@ init_insn_lengths (void) get its actual length. Otherwise, use FALLBACK_FN to calculate the length. */ static int -get_attr_length_1 (rtx insn, int (*fallback_fn) (rtx)) +get_attr_length_1 (rtx uncast_insn, int (*fallback_fn) (rtx)) { + rtx_insn *insn = as_a (uncast_insn); rtx body; int i; int length = 0; @@ -2847,7 +2848,7 @@ final_scan_insn (rtx uncast_insn, FILE *file, int optimize_p ATTRIBUTE_UNUSED, if (optimize_p && !flag_no_peephole && !nopeepholes) { - rtx next = peephole (insn); + rtx_insn *next = peephole (insn); /* When peepholing, if there were notes within the peephole, emit them before the peephole. */ if (next != 0 && next != NEXT_INSN (insn)) -- 1.8.5.3