From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1314) id 9EAFB3858C27; Wed, 17 Nov 2021 08:05:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9EAFB3858C27 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Andrew Pinski To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-5333] Fix PR 103288, ICE after PHI-OPT, move an assigment when still in use for another bb X-Act-Checkin: gcc X-Git-Author: Andrew Pinski X-Git-Refname: refs/heads/trunk X-Git-Oldrev: b8ce19bb1a0592051e8f9a4c3252d12ae605b256 X-Git-Newrev: 1a15a91a0015208eafb797e4de1348c9877fd6d0 Message-Id: <20211117080536.9EAFB3858C27@sourceware.org> Date: Wed, 17 Nov 2021 08:05:36 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Nov 2021 08:05:36 -0000 https://gcc.gnu.org/g:1a15a91a0015208eafb797e4de1348c9877fd6d0 commit r12-5333-g1a15a91a0015208eafb797e4de1348c9877fd6d0 Author: Andrew Pinski Date: Tue Nov 16 23:37:08 2021 +0000 Fix PR 103288, ICE after PHI-OPT, move an assigment when still in use for another bb The problem is r12-5300-gf98f373dd822b35c allows phiopt to recognize more basic blocks but missed one location where phiopt could move an assignment from the middle block to the non-middle one. This patch fixes that. OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions. PR tree-optimization/103288 gcc/ChangeLog: * tree-ssa-phiopt.c (value_replacement): Return early if middle block has more than one pred. gcc/testsuite/ChangeLog: * gcc.c-torture/compile/pr103288-1.c: New test. Diff: --- gcc/testsuite/gcc.c-torture/compile/pr103288-1.c | 6 ++++++ gcc/tree-ssa-phiopt.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/gcc/testsuite/gcc.c-torture/compile/pr103288-1.c b/gcc/testsuite/gcc.c-torture/compile/pr103288-1.c new file mode 100644 index 00000000000..88d1c675599 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr103288-1.c @@ -0,0 +1,6 @@ + +int ui_5; +long func_14_uli_8; +void func_14() { + ui_5 &= (func_14_uli_8 ? 60 : ui_5) ? 5 : 0; +} diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c index 6b22f6bedd4..8984a5e15ab 100644 --- a/gcc/tree-ssa-phiopt.c +++ b/gcc/tree-ssa-phiopt.c @@ -1381,6 +1381,9 @@ value_replacement (basic_block cond_bb, basic_block middle_bb, } } + if (!single_pred_p (middle_bb)) + return 0; + /* Now optimize (x != 0) ? x + y : y to just x + y. */ gsi = gsi_last_nondebug_bb (middle_bb); if (gsi_end_p (gsi))