From: Jeffrey A Law Date: Wed, 4 Aug 1999 07:11:26 +0000 (+0000) Subject: flow.c (delete_unreachable_blocks): Do not call merge_blocks or tidy_fallthru_edge... X-Git-Tag: prereleases/libstdc++-2.92~11354 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8fe3cc34e9a4cdc8cc183276d772cc6558e94b1;p=thirdparty%2Fgcc.git flow.c (delete_unreachable_blocks): Do not call merge_blocks or tidy_fallthru_edge if... * flow.c (delete_unreachable_blocks): Do not call merge_blocks or tidy_fallthru_edge if the last insn in the block is not an unconditional jump or a simple conditional jump. From-SVN: r28483 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ad53adfe20d9..37afbd6c0e96 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Wed Aug 4 01:08:44 1999 Jeffrey A Law (law@cygnus.com) + + * flow.c (delete_unreachable_blocks): Do not call merge_blocks + or tidy_fallthru_edge if the last insn in the block is not + an unconditional jump or a simple conditional jump. + Tue Aug 3 20:21:20 1999 J"orn Rennecke * Makefile.in (c-decl.o): Depends on defaults.h. diff --git a/gcc/flow.c b/gcc/flow.c index 7ec0832f0c67..9ca8f5c88fb0 100644 --- a/gcc/flow.c +++ b/gcc/flow.c @@ -1563,7 +1563,12 @@ delete_unreachable_blocks () check that the edge is not a FALLTHRU edge. */ if ((s = b->succ) != NULL && s->succ_next == NULL - && s->dest == c) + && s->dest == c + /* If the last insn is not a normal conditional jump + (or an unconditional jump), then we can not tidy the + fallthru edge because we can not delete the jump. */ + && GET_CODE (b->end) == JUMP_INSN + && condjump_p (b->end)) tidy_fallthru_edge (s, b, c); } @@ -1582,6 +1587,11 @@ delete_unreachable_blocks () && (s->flags & EDGE_EH) == 0 && (c = s->dest) != EXIT_BLOCK_PTR && c->pred->pred_next == NULL + /* If the last insn is not a normal conditional jump + (or an unconditional jump), then we can not merge + the blocks because we can not delete the jump. */ + && GET_CODE (b->end) == JUMP_INSN + && condjump_p (b->end) && merge_blocks (s, b, c)) continue;