From: Alan Modra Date: Sat, 15 Oct 2011 13:39:58 +0000 (+1030) Subject: re PR bootstrap/50738 (Bootstrap failure at revision 180028 on powerpc-apple-darwin9) X-Git-Tag: releases/gcc-4.7.0~3078 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89e4bd80d885888c5e7bd9ab846b578ea73c6954;p=thirdparty%2Fgcc.git re PR bootstrap/50738 (Bootstrap failure at revision 180028 on powerpc-apple-darwin9) PR bootstrap/50738 * ifcvt.c (dead_or_predicable): Revert accidental commit with HAVE_simple_return test. From-SVN: r180038 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8a0f6ef0f500..b99632baa9f1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +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 diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index fee35326a14d..784e2e8b106b 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