From ef3e98869075132505d8e1e1c9deaa5fee42e0eb Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Sun, 23 Mar 2003 12:40:26 -0800 Subject: [PATCH] cfgcleanup.c (try_optimize_cfg): Allow merging of tablejumps before flow2. * cfgcleanup.c (try_optimize_cfg): Allow merging of tablejumps before flow2. * cfgrtl.c (try_redirect_by_replacing_jump): Similarly. From-SVN: r64754 --- gcc/ChangeLog | 6 ++++++ gcc/cfgcleanup.c | 4 +++- gcc/cfgrtl.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 65799f53327..f98fa02a882 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-03-23 Richard Henderson + + * cfgcleanup.c (try_optimize_cfg): Allow merging of tablejumps + before flow2. + * cfgrtl.c (try_redirect_by_replacing_jump): Similarly. + 2003-03-23 Richard Henderson PR opt/10116 diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c index 42dc0a9e4c5..23436d599f1 100644 --- a/gcc/cfgcleanup.c +++ b/gcc/cfgcleanup.c @@ -1791,7 +1791,9 @@ try_optimize_cfg (mode) /* If the jump insn has side effects, we can't kill the edge. */ && (GET_CODE (b->end) != JUMP_INSN - || simplejump_p (b->end)) + || (flow2_completed + ? simplejump_p (b->end) + : onlyjump_p (b->end))) && (next = merge_blocks (s, b, c, mode))) { b = next; diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 31f71106251..01b7e92c2cb 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -684,7 +684,7 @@ try_redirect_by_replacing_jump (e, target) if (tmp || !onlyjump_p (insn)) return false; - if (reload_completed && JUMP_LABEL (insn) + if (flow2_completed && JUMP_LABEL (insn) && (table = NEXT_INSN (JUMP_LABEL (insn))) != NULL_RTX && GET_CODE (table) == JUMP_INSN && (GET_CODE (PATTERN (table)) == ADDR_VEC -- 2.30.2