From patchwork Mon Aug 21 08:08:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 136349 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2852819vqi; Mon, 21 Aug 2023 01:09:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF6CJnI2A4NipD4BrcDLrfPOu6xR7vOZHPn/aqhxh+a3UyMAGdL5c6ZRYdkzfmB2l7NXG1r X-Received: by 2002:a17:907:3f10:b0:99c:10b5:7650 with SMTP id hq16-20020a1709073f1000b0099c10b57650mr7117131ejc.1.1692605363951; Mon, 21 Aug 2023 01:09:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692605363; cv=none; d=google.com; s=arc-20160816; b=WYfhSsB2vq6QnOggai0uLy+R5xw/vBtBybkSPSru931O3UWWP7dp3Nw5WUoEP6zlJs a+jPTLZHFimhvT4aaPB0TrHKJ2mx3SNCD0JRCb+2gDT08XYjuC5KJJ6F74Mzp1lG8NY1 yXwTipgTx3X+tvnJsvDOIF1Su1gysQUYUEx+dZf86n5OBmPcMuSoL8aW+QP+c0Wgxieq KXio+5I4eALhX7G5T/qQRAfvfgJNA/X4aik/1v8fcpLfq3ofyNBYdGWc9UrCsxZcJnSz EumALloiQmZXkYa2AcLfSj6Vlg7pFoagGwSF+/4uhiIEy5vLyv2l+jdElrqL8FaPMEIW aSKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:sender:errors-to:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :mime-version:user-agent:subject:to:date:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=2nrsH+8kyJXkpis0ZmxyRzwd+3j+WxfXGhaAE/8RIBo=; fh=etb9MYHN7HLF/sff76ICVdPeKiI8ZsjoOL2bcdG0aog=; b=af8NknkKyE6edVzftSwkpmDXhECJw/OTQ6ZOUr8GAlgGajuUBUwjzP6+Sh9FGiHdgw HHnC/2Okw9KzShdzhfzfqG4+HjcIYNOew8h1dvTrYyNFEl5UEq4BKxpa9lCggjggSQGS sIxFLDPN5epnRZepkvBOCyc9H3ru5C0Xph7YQtl2gzyNDaZOd6v8eXIApSA4b0RO6EpE ZDPwo0tcIHl8PCXlZV95Dh0OgNertvMYXSihRHfh1LPBfe9HkEnNx0GqSFVxlTCpGq3D 0YA8VzWinLe7Qkx8gdichHoJnV/0uAU6YrrPXMRoGF1ARAsW4/f1nwVHvlI8jCAEvJ71 tHew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=QHU2PkSf; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id rs15-20020a170907036f00b0099bd4533576si5535938ejb.753.2023.08.21.01.09.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 01:09:23 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=QHU2PkSf; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 40614385B800 for ; Mon, 21 Aug 2023 08:09:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 40614385B800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1692605360; bh=2nrsH+8kyJXkpis0ZmxyRzwd+3j+WxfXGhaAE/8RIBo=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=QHU2PkSfZFKILS7gH0i0/IUgVgomksBPbGz22kTnEvDiKYyDMPv6rPvMkzporZD/6 LrqDPs6/zNp7iEkz+I+5fmJ8sd4WBdwwX8STP3E3ZWRZ/MsfYD52YKDU4gxqlP85Ug d/pIQ24Udm980Zm82AdbgLfn4Lzlr+f2zIKlW0hk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 3F5BC385771C for ; Mon, 21 Aug 2023 08:08:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3F5BC385771C Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 7748E20576 for ; Mon, 21 Aug 2023 08:08:36 +0000 (UTC) Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 7240D2C143 for ; Mon, 21 Aug 2023 08:08:36 +0000 (UTC) Date: Mon, 21 Aug 2023 08:08:36 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/111070 - fix ICE with recent ifcombine fix User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" Message-Id: <20230821080920.40614385B800@sourceware.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774825362329993814 X-GMAIL-MSGID: 1774825362329993814 We now got test coverage for non-SSA name bits so the following amends the SSA_NAME_OCCURS_IN_ABNORMAL_PHI checks. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. Richard. PR tree-optimization/111070 * tree-ssa-ifcombine.cc (ifcombine_ifandif): Check we have an SSA name before checking SSA_NAME_OCCURS_IN_ABNORMAL_PHI. * gcc.dg/pr111070.c: New testcase. --- gcc/testsuite/gcc.dg/pr111070.c | 20 ++++++++++++++++++++ gcc/tree-ssa-ifcombine.cc | 9 ++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr111070.c diff --git a/gcc/testsuite/gcc.dg/pr111070.c b/gcc/testsuite/gcc.dg/pr111070.c new file mode 100644 index 00000000000..1ebc7adf782 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr111070.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-options "-O" } */ + +/* common */ +char c; +/* arrays must be 8 byte aligned, regardless of size */ +char c_ary[1]; + +/* data */ +char d = 1; +char d_ary[1] = {1}; + +int main () +{ + if (((unsigned long)&c_ary[0] & 7) != 0) + return 1; + if (((unsigned long)&d_ary[0] & 7) != 0) + return 1; + return 0; +} diff --git a/gcc/tree-ssa-ifcombine.cc b/gcc/tree-ssa-ifcombine.cc index d5701e8c407..46b076804f4 100644 --- a/gcc/tree-ssa-ifcombine.cc +++ b/gcc/tree-ssa-ifcombine.cc @@ -430,7 +430,8 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv, { tree t, t2; - if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1)) + if (TREE_CODE (name1) == SSA_NAME + && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1)) return false; /* Do it. */ @@ -489,8 +490,10 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv, gimple_stmt_iterator gsi; tree t; - if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1) - || SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name2)) + if ((TREE_CODE (name1) == SSA_NAME + && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1)) + || (TREE_CODE (name2) == SSA_NAME + && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name2))) return false; /* Find the common name which is bit-tested. */