diff options
| author | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-16 11:30:48 +0000 |
|---|---|---|
| committer | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-16 11:30:48 +0000 |
| commit | 18f811c97247140eac1b512edb00e72ccf44d3d7 (patch) | |
| tree | 035b836f27718d7ce18d5d4320d638b8f3678625 /gcc | |
| parent | ce6c30847e3d1eda465ec09f561db45836f149ac (diff) | |
| download | gcc-18f811c97247140eac1b512edb00e72ccf44d3d7.tar.gz | |
PR opt/11350
* cfgcleanup.c (try_optimize_cfg): Suppress tablejump removal
after reload.
* cfgrtl.c (rtl_can_merge_blocks, cfglayout_can_merge_blocks,
rtl_try_redirect_by_replacing_branch): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75968 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cfgcleanup.c | 2 | ||||
| -rw-r--r-- | gcc/cfgrtl.c | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index adc7d9bd8b7..d57fcb051df 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2004-01-16 Jan Hubicka <jh@suse.cz> + + PR opt/11350 + * cfgcleanup.c (try_optimize_cfg): Suppress tablejump removal + after reload. + * cfgrtl.c (rtl_can_merge_blocks, cfglayout_can_merge_blocks, + rtl_try_redirect_by_replacing_branch): Likewise. + 2004-01-15 Geoffrey Keating <geoffk@apple.com> PR pch/13689 diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c index 3e68cbe3a17..3da1ea5ae59 100644 --- a/gcc/cfgcleanup.c +++ b/gcc/cfgcleanup.c @@ -1766,7 +1766,7 @@ try_optimize_cfg (int mode) /* If the jump insn has side effects, we can't kill the edge. */ && (GET_CODE (BB_END (b)) != JUMP_INSN - || (flow2_completed + || (reload_completed ? simplejump_p (BB_END (b)) : onlyjump_p (BB_END (b)))) && (next = merge_blocks_move (s, b, c, mode))) diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 7839d5bf750..c1b17455345 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -661,7 +661,7 @@ rtl_can_merge_blocks (basic_block a,basic_block b) /* If the jump insn has side effects, we can't kill the edge. */ && (GET_CODE (BB_END (a)) != JUMP_INSN - || (flow2_completed + || (reload_completed ? simplejump_p (BB_END (a)) : onlyjump_p (BB_END (a))))); } @@ -703,7 +703,7 @@ try_redirect_by_replacing_jump (edge e, basic_block target, bool in_cfglayout) if (tmp || !onlyjump_p (insn)) return false; - if ((!optimize || flow2_completed) && tablejump_p (insn, NULL, NULL)) + if ((!optimize || reload_completed) && tablejump_p (insn, NULL, NULL)) return false; /* Avoid removing branch with side effects. */ @@ -2607,7 +2607,7 @@ cfg_layout_can_merge_blocks_p (basic_block a, basic_block b) /* If the jump insn has side effects, we can't kill the edge. */ && (GET_CODE (BB_END (a)) != JUMP_INSN - || (flow2_completed + || (reload_completed ? simplejump_p (BB_END (a)) : onlyjump_p (BB_END (a))))); } |