diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 47464c38a48..fb5fe2399b4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Sun Sep 13 04:37:28 1998 David S. Miller + + * loop.c (move_movables): While removing insn sequences, preserve + the next pointer of the most recently deleted insn when we skip + over a NOTE. + Sat Sep 12 11:37:19 1998 Michael Meissner * rs6000.h ({ASM,CPP}_CPU_SPEC): Add support for all machines diff --git a/gcc/loop.c b/gcc/loop.c index eae3d7451f4..3efb200f0f7 100644 --- a/gcc/loop.c +++ b/gcc/loop.c @@ -1916,9 +1916,17 @@ move_movables (movables, threshold, insn_count, loop_start, end, nregs) temp = delete_insn (temp); } + temp = p; p = delete_insn (p); + + /* simplify_giv_expr expects that it can walk the insns + at m->insn forwards and see this old sequence we are + tossing here. delete_insn does preserve the next + pointers, but when we skip over a NOTE we must fix + it up. Otherwise that code walks into the non-deleted + insn stream. */ while (p && GET_CODE (p) == NOTE) - p = NEXT_INSN (p); + p = NEXT_INSN (temp) = NEXT_INSN (p); } start_sequence (); @@ -2125,9 +2133,18 @@ move_movables (movables, threshold, insn_count, loop_start, end, nregs) XEXP (temp, 0) = i1; } + temp = p; delete_insn (p); - do p = NEXT_INSN (p); - while (p && GET_CODE (p) == NOTE); + p = NEXT_INSN (p); + + /* simplify_giv_expr expects that it can walk the insns + at m->insn forwards and see this old sequence we are + tossing here. delete_insn does preserve the next + pointers, but when we skip over a NOTE we must fix + it up. Otherwise that code walks into the non-deleted + insn stream. */ + while (p && GET_CODE (p) == NOTE) + p = NEXT_INSN (temp) = NEXT_INSN (p); } /* The more regs we move, the less we like moving them. */