From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1314) id 10E623858038; Fri, 19 Nov 2021 07:20:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 10E623858038 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-5393] Fix PR 103317, ICE after PHI-OPT, minmax_replacement producing invalid SSA X-Act-Checkin: gcc X-Git-Author: Andrew Pinski X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 527e54a431473cc497204226a21f2831d2375e66 X-Git-Newrev: 09d462146b3107c665265b11ad925c61a91c6efb Message-Id: <20211119072006.10E623858038@sourceware.org> Date: Fri, 19 Nov 2021 07:20:06 +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: Fri, 19 Nov 2021 07:20:06 -0000 https://gcc.gnu.org/g:09d462146b3107c665265b11ad925c61a91c6efb commit r12-5393-g09d462146b3107c665265b11ad925c61a91c6efb Author: Andrew Pinski Date: Thu Nov 18 23:38:30 2021 +0000 Fix PR 103317, ICE after PHI-OPT, minmax_replacement producing invalid SSA The problem is r12-5300-gf98f373dd822b35c allows phiopt to recognize more basic blocks but missed one location where the basic block does not need to be empty but still needs to have a single predecessor. This patch fixes that over sight. OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions. PR tree-optimization/103317 gcc/ChangeLog: * tree-ssa-phiopt.c (minmax_replacement): For the non empty middle bb case, check to make sure it has a single predecessor. gcc/testsuite/ChangeLog: * gcc.c-torture/compile/pr103317-1.c: New test. Diff: --- gcc/testsuite/gcc.c-torture/compile/pr103317-1.c | 13 +++++++++++++ gcc/tree-ssa-phiopt.c | 3 +++ 2 files changed, 16 insertions(+) diff --git a/gcc/testsuite/gcc.c-torture/compile/pr103317-1.c b/gcc/testsuite/gcc.c-torture/compile/pr103317-1.c new file mode 100644 index 00000000000..f9d145e0da9 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr103317-1.c @@ -0,0 +1,13 @@ +int a, b; +char c; +void +d (void) +{ + char e = c; + if (b) + if (c < 16 - 11) + e = 16 - 11; + if (e > 8) + e = 8; + a = e; +} diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c index f0431684089..1abc4ea21cc 100644 --- a/gcc/tree-ssa-phiopt.c +++ b/gcc/tree-ssa-phiopt.c @@ -1780,6 +1780,9 @@ minmax_replacement (basic_block cond_bb, basic_block middle_bb, gimple *assign = last_and_only_stmt (middle_bb); tree lhs, op0, op1, bound; + if (!single_pred_p (middle_bb)) + return false; + if (!assign || gimple_code (assign) != GIMPLE_ASSIGN) return false;