diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ifcvt.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8a0f6ef..b99632b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2011-10-15 Alan Modra <amodra@gmail.com> + PR bootstrap/50738 + * ifcvt.c (dead_or_predicable): Revert accidental commit with + HAVE_simple_return test. + +2011-10-15 Alan Modra <amodra@gmail.com> + * ifcvt.c (dead_or_predicable): Disable if-conversion when doing so is likely to kill a shrink-wrapping opportunity. diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index fee3532..784e2e8 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -4173,7 +4173,7 @@ dead_or_predicable (basic_block test_bb, basic_block merge_bb, register used to pass function parameters, which then must be saved in caller-saved regs. A caller-saved reg requires the prologue, killing a shrink-wrap opportunity. */ - if ((flag_shrink_wrap && HAVE_simple_return && !epilogue_completed) + if ((flag_shrink_wrap && !epilogue_completed) && ENTRY_BLOCK_PTR->next_bb == test_bb && single_succ_p (new_dest) && single_succ (new_dest) == EXIT_BLOCK_PTR |