diff options
| author | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-23 20:40:26 +0000 |
|---|---|---|
| committer | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-23 20:40:26 +0000 |
| commit | 8583bf9c2cac6fb307dafba8a3c0445911b1aa76 (patch) | |
| tree | d834a7d0bea7c7fed3f67f846807bb85f2f13986 | |
| parent | aa9f1e71eff9cb0aad9d903b63ec8f0adf484813 (diff) | |
| download | gcc-8583bf9c2cac6fb307dafba8a3c0445911b1aa76.tar.gz | |
* cfgcleanup.c (try_optimize_cfg): Allow merging of tablejumps
before flow2.
* cfgrtl.c (try_redirect_by_replacing_jump): Similarly.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@64754 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cfgcleanup.c | 4 | ||||
| -rw-r--r-- | 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,5 +1,11 @@ 2003-03-23 Richard Henderson <rth@redhat.com> + * cfgcleanup.c (try_optimize_cfg): Allow merging of tablejumps + before flow2. + * cfgrtl.c (try_redirect_by_replacing_jump): Similarly. + +2003-03-23 Richard Henderson <rth@redhat.com> + PR opt/10116 * ifcvt.c (find_if_block): Disallow tablejump insns outgoing from then_bb or else_bb after flow2. 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 |