aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorSteven Bosscher <stevenb@suse.de>2004-07-17 10:41:44 +0000
committerSteven Bosscher <steven@gcc.gnu.org>2004-07-17 10:41:44 +0000
commit4928181ca2157ee10db623931316a05288822bb3 (patch)
tree20a6beaa09ceb2b65735e8188907b8f60e6ebf84 /gcc
parent3e3970a27611d6cf2c5d8cfaa73e9e17f38b530c (diff)
downloadgcc-4928181ca2157ee10db623931316a05288822bb3.zip
gcc-4928181ca2157ee10db623931316a05288822bb3.tar.gz
gcc-4928181ca2157ee10db623931316a05288822bb3.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/final.c24
2 files changed, 18 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6e902af..de2cbff 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-17 Steven Bosscher <stevenb@suse.de>
+
+ * final.c (final_scan_insn): Fix broken commit from previous
+ patch.
+
2004-07-17 Joseph S. Myers <jsm@polyomino.org.uk>
* c-typeck.c (parser_build_binary_op): Condition warnings for
diff --git a/gcc/final.c b/gcc/final.c
index ea75e54..f5da0a8 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))