From 05549c9604478e34987a41237d67261c42081c0a Mon Sep 17 00:00:00 2001 From: Steven Bosscher Date: Sat, 25 Nov 2006 10:53:06 +0000 Subject: jump.c (mark_all_labels): Work in cfglayout mode. * jump.c (mark_all_labels): Work in cfglayout mode. * cfgcleanup.c (cleanup_cfg): Do not call delete_dead_jumptables when in cfglayout mode, because there are no dead jumptables visible. * cfgrtl.c (commit_one_edge_insertion): Don't set bb->aux when in cfglayout mode. (commit_edge_insertions): Do not allow insertion of instructions with control flow insns when in cfglayout mode. From-SVN: r119191 --- gcc/cfgcleanup.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gcc/cfgcleanup.c') diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c index 046ee77..ad9ae4f 100644 --- a/gcc/cfgcleanup.c +++ b/gcc/cfgcleanup.c @@ -763,8 +763,6 @@ merge_blocks_move (edge e, basic_block b, basic_block c, int mode) if (BB_PARTITION (b) != BB_PARTITION (c)) return NULL; - - /* If B has a fallthru edge to C, no need to move anything. */ if (e->flags & EDGE_FALLTHRU) { @@ -2260,7 +2258,15 @@ cleanup_cfg (int mode) } else break; - delete_dead_jumptables (); + + /* Don't call delete_dead_jumptables in cfglayout mode, because + that function assumes that jump tables are in the insns stream. + But we also don't _have_ to delete dead jumptables in cfglayout + mode because we shouldn't even be looking at things that are + not in a basic block. Dead jumptables are cleaned up when + going out of cfglayout mode. */ + if (!(mode & CLEANUP_CFGLAYOUT)) + delete_dead_jumptables (); } timevar_pop (TV_CLEANUP_CFG); -- cgit v1.1