From 790199856aab807f3810413867f739c702c6a3e9 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 18 Jul 2003 14:33:36 -0700 Subject: [PATCH] cfgrtl.c (force_nonfallthru_and_redirect): Use tablejump_p to skip the addr_vec. * cfgrtl.c (force_nonfallthru_and_redirect): Use tablejump_p to skip the addr_vec. From-SVN: r69569 --- gcc/ChangeLog | 5 +++++ gcc/cfgrtl.c | 19 ++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 644da7bf323..0b711da0476 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2003-07-18 Richard Henderson + + * cfgrtl.c (force_nonfallthru_and_redirect): Use tablejump_p + to skip the addr_vec. + Fri Jul 18 15:22:28 2003 Alexandre Oliva * combine.c (combinable_i3pat): Don't forbid occurrences of diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index d197b79380a..903f57eac3f 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -1036,18 +1036,15 @@ force_nonfallthru_and_redirect (edge e, basic_block target) { /* Create the new structures. */ - /* Position the new block correctly relative to loop notes. */ - note = last_loop_beg_note (e->src->end); - note = NEXT_INSN (note); + /* If the old block ended with a tablejump, skip its table + by searching forward from there. Otherwise start searching + forward from the last instruction of the old block. */ + if (!tablejump_p (e->src->end, NULL, ¬e)) + note = e->src->end; - /* ... and ADDR_VECs. */ - if (note != NULL - && GET_CODE (note) == CODE_LABEL - && NEXT_INSN (note) - && GET_CODE (NEXT_INSN (note)) == JUMP_INSN - && (GET_CODE (PATTERN (NEXT_INSN (note))) == ADDR_DIFF_VEC - || GET_CODE (PATTERN (NEXT_INSN (note))) == ADDR_VEC)) - note = NEXT_INSN (NEXT_INSN (note)); + /* Position the new block correctly relative to loop notes. */ + note = last_loop_beg_note (note); + note = NEXT_INSN (note); jump_block = create_basic_block (note, NULL, e->src); jump_block->count = e->count;