diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/final.c | 14 |
2 files changed, 19 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 56a2879..02d6e23 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-04-01 Ian Lance Taylor <ian@airs.com> + + * final.c (final_scan_insn): Revert part of 2005-03-30 patch: when + doing a peephole optimization, once again put any notes in the + proper position. + 2005-04-01 Kazu Hirata <kazu@cs.umass.edu> * bb-reorder.c, fold-const.c, varasm.c: Fix comment typos. diff --git a/gcc/final.c b/gcc/final.c index 7633724..ea84255 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -2306,11 +2306,23 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, emit them before the peephole. */ if (next != 0 && next != NEXT_INSN (insn)) { - rtx note; + rtx note, prev = PREV_INSN (insn); for (note = NEXT_INSN (insn); note != next; note = NEXT_INSN (note)) final_scan_insn (note, file, optimize, nopeepholes, seen); + + /* Put the notes in the proper position for a later + rescan. For example, the SH target can do this + when generating a far jump in a delayed branch + sequence. */ + note = NEXT_INSN (insn); + PREV_INSN (note) = prev; + NEXT_INSN (prev) = note; + NEXT_INSN (PREV_INSN (next)) = insn; + PREV_INSN (insn) = PREV_INSN (next); + NEXT_INSN (insn) = next; + PREV_INSN (next) = insn; } /* PEEPHOLE might have changed this. */ |