From patchwork Thu Dec 1 09:18:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 61303 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 29121385841C for ; Thu, 1 Dec 2022 09:18:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 29121385841C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669886338; bh=Vn8XrfD/OUqOaghPXe9XaX6q3nUbLoJbtLpFQxcBeB8=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=AL7SD0/eSZw2agOBomDnGdLyleBMQsL3EawxqKbClH0Dy8pv/6mjI+/jFvF/Vr1U9 +/9pJxANd2ib+rw/Oy2dn89molDMMnXI/UMrvXP/wFdbicDWoAYZmEO/na77pxkn4e twDTKYpmY8e8MNln+Dsyx1EFyjmFLuJpVTMldJQQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 871A33858D3C for ; Thu, 1 Dec 2022 09:18:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 871A33858D3C Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 51D1621B16 for ; Thu, 1 Dec 2022 09:18:23 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 3D45F13B4A for ; Thu, 1 Dec 2022 09:18:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +e++DV9xiGNqKgAAMHmgww (envelope-from ) for ; Thu, 01 Dec 2022 09:18:23 +0000 Date: Thu, 1 Dec 2022 10:18:22 +0100 (CET) To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/107935 - fixup equivalence handling in PHI VN MIME-Version: 1.0 Message-Id: <20221201091823.3D45F13B4A@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The following makes sure to honor the backedge processing logic that forces VARYING there. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/107935 * tree-ssa-sccvn.cc (visit_phi): Honor forced VARYING on backedges. * gcc.dg/torture/pr107935.c: New testcase. --- gcc/testsuite/gcc.dg/torture/pr107935.c | 18 ++++++++++++++++++ gcc/tree-ssa-sccvn.cc | 7 ++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr107935.c diff --git a/gcc/testsuite/gcc.dg/torture/pr107935.c b/gcc/testsuite/gcc.dg/torture/pr107935.c new file mode 100644 index 00000000000..78175100f80 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr107935.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ + +int *a, **b; +int main() { + int d = 0, *e = &d; + L: + *e = d; + if (a) { + int *g = e = *b; + if (!e) + __builtin_abort(); + if (**b) + return 0; + *g = 1; + goto L; + } + return 0; +} diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc index 6895ae84d13..fa2f65df159 100644 --- a/gcc/tree-ssa-sccvn.cc +++ b/gcc/tree-ssa-sccvn.cc @@ -5861,7 +5861,12 @@ visit_phi (gimple *phi, bool *inserted, bool backedges_varying_p) continue; } /* There's also the possibility to use equivalences. */ - if (!FLOAT_TYPE_P (TREE_TYPE (def))) + if (!FLOAT_TYPE_P (TREE_TYPE (def)) + /* But only do this if we didn't force any of sameval or + val to VARYING because of backedge processing rules. */ + && (TREE_CODE (sameval) != SSA_NAME + || SSA_VAL (sameval) == sameval) + && (TREE_CODE (def) != SSA_NAME || SSA_VAL (def) == def)) { vn_nary_op_t vnresult; tree ops[2];