From ebb480ca519ef5b89f291c81af05a96d8ebe4e10 Mon Sep 17 00:00:00 2001 From: amodra Date: Sat, 15 Oct 2011 13:39:58 +0000 Subject: [PATCH] PR bootstrap/50738 * ifcvt.c (dead_or_predicable): Revert accidental commit with HAVE_simple_return test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@180038 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/ifcvt.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + PR bootstrap/50738 + * ifcvt.c (dead_or_predicable): Revert accidental commit with + HAVE_simple_return test. + +2011-10-15 Alan Modra + * 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 -- 2.7.4