From 4928181ca2157ee10db623931316a05288822bb3 Mon Sep 17 00:00:00 2001 From: Steven Bosscher Date: Sat, 17 Jul 2004 10:41:44 +0000 Subject: [PATCH] final.c (final_scan_insn): Fix broken commit from previous patch. * final.c (final_scan_insn): Fix broken commit from previous patch. From-SVN: r84861 --- gcc/ChangeLog | 5 +++++ gcc/final.c | 24 +++++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6e902afd7ad..de2cbff6bff 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-07-17 Steven Bosscher + + * final.c (final_scan_insn): Fix broken commit from previous + patch. + 2004-07-17 Joseph S. Myers * c-typeck.c (parser_build_binary_op): Condition warnings for diff --git a/gcc/final.c b/gcc/final.c index ea75e541348..f5da0a8023f 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -2008,17 +2008,19 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, break; #ifdef HAVE_cc0 - /* If there is a REG_CC_SETTER note on this insn, it means that - the setting of the condition code was done in the delay slot - of the insn that branched here. So recover the cc status - from the insn that set it. */ + { + /* If there is a REG_CC_SETTER note on this insn, it means that + the setting of the condition code was done in the delay slot + of the insn that branched here. So recover the cc status + from the insn that set it. */ - note = find_reg_note (insn, REG_CC_SETTER, NULL_RTX); - if (note) - { - NOTICE_UPDATE_CC (PATTERN (XEXP (note, 0)), XEXP (note, 0)); - cc_prev_status = cc_status; - } + rtx note = find_reg_note (insn, REG_CC_SETTER, NULL_RTX); + if (note) + { + NOTICE_UPDATE_CC (PATTERN (XEXP (note, 0)), XEXP (note, 0)); + cc_prev_status = cc_status; + } + } #endif /* Detect insns that are really jump-tables @@ -2401,7 +2403,7 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, emit them before the peephole. */ if (next != 0 && next != NEXT_INSN (insn)) { - rtx prev = PREV_INSN (insn); + rtx note, prev = PREV_INSN (insn); for (note = NEXT_INSN (insn); note != next; note = NEXT_INSN (note))