From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id A13293858CDB for ; Mon, 5 Feb 2024 10:05:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A13293858CDB Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A13293858CDB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707127555; cv=none; b=pUdpPuJiqWLRxzn3R9beW8AX9ToiFL2h63bKvxQg4LZHwPQ7G2H0WE4Ko/RFa+sorm0ORiHj3b+Y5uib5SAVnzK3dbSf3sEWD9B6noh+rDkcnqrzYL4kTzBY/9ctCS+8MjR6JvgufyjMQ/NiYJpUg/S1lii+JF9E4dAz5Eu1hPw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707127555; c=relaxed/simple; bh=/MY5IfiMXKW/9DGGbrwffupG+ahOFSmBGD4UslhtVMc=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=FKuq/BLpyJvqhA9ocGk+OF+o2JCSjWSVj8MnTdfpny6QBxjYU3GQI27DPRZXMXOjTWNrjWWwohpHuF5/Q/Yi1jVFM6BqyM/Bqx3mBxM4a/k4UT5EfnfqFsRczSPgYa/y/MrhlHLkjJ8SxUwxTl3guqzikp/qGZVyMI5lXx9PIS4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from [10.168.4.150] (unknown [10.168.4.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 9877922060 for ; Mon, 5 Feb 2024 10:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707127552; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=m9FFjff97b9Z3qCpRWhrt0iSe4MArVePW9Q4nCxPHVQ=; b=vTYWErTe0EBjXeIdUTx2+A8/KnC7Hn2XKRHUpW7nNm7nQ63VOyJU/P6DgwEMFS5+9jo5z+ uihbEw+HYWfJd16KtLyWDslSOERAZer9OBObJxmAFf0DBnhZ+puOe1Z1lz8ExqgiF832rl 1LWT8/2J4foVMLDmHxslMiZZ8wARLWI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707127552; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=m9FFjff97b9Z3qCpRWhrt0iSe4MArVePW9Q4nCxPHVQ=; b=yigW6MNW6TDrkRfpjxiCOvE9cwSJsbUYkGtdllD4MpBmb1W2ZlJYr1NjcGfDNEJrX8uv9B uB+sQRqyRc0HmJAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707127552; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=m9FFjff97b9Z3qCpRWhrt0iSe4MArVePW9Q4nCxPHVQ=; b=vTYWErTe0EBjXeIdUTx2+A8/KnC7Hn2XKRHUpW7nNm7nQ63VOyJU/P6DgwEMFS5+9jo5z+ uihbEw+HYWfJd16KtLyWDslSOERAZer9OBObJxmAFf0DBnhZ+puOe1Z1lz8ExqgiF832rl 1LWT8/2J4foVMLDmHxslMiZZ8wARLWI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707127552; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=m9FFjff97b9Z3qCpRWhrt0iSe4MArVePW9Q4nCxPHVQ=; b=yigW6MNW6TDrkRfpjxiCOvE9cwSJsbUYkGtdllD4MpBmb1W2ZlJYr1NjcGfDNEJrX8uv9B uB+sQRqyRc0HmJAQ== Date: Mon, 5 Feb 2024 11:05:52 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/113707 - ICE with VN elimination MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: smtp-out1.suse.de; none X-Spamd-Result: default: False [-0.60 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MISSING_MID(2.50)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-3.00)[100.00%] X-Spam-Level: X-Spam-Score: -0.60 X-Spam-Status: No, score=-10.5 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,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Message-ID: <20240205100552.xSyD2W5RBrN0j9nYDLZKO6slIVclWni32E78LYbUXek@z> The following avoids different avail answers depending on how the iteration progressed. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/113707 * tree-ssa-sccvn.cc (rpo_elim::eliminate_avail): After checking the avail set treat out-of-region defines as available. * gcc.dg/torture/pr113707-1.c: New testcase. * gcc.dg/torture/pr113707-2.c: Likewise. --- gcc/testsuite/gcc.dg/torture/pr113707-1.c | 45 +++++++++++++++++++++++ gcc/testsuite/gcc.dg/torture/pr113707-2.c | 26 +++++++++++++ gcc/tree-ssa-sccvn.cc | 5 +++ 3 files changed, 76 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/torture/pr113707-1.c create mode 100644 gcc/testsuite/gcc.dg/torture/pr113707-2.c diff --git a/gcc/testsuite/gcc.dg/torture/pr113707-1.c b/gcc/testsuite/gcc.dg/torture/pr113707-1.c new file mode 100644 index 00000000000..c1a50b31025 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr113707-1.c @@ -0,0 +1,45 @@ +/* { dg-do compile } */ + +int printf(const char *, ...); +struct a { + int b; +} n; +int a, c, d, e, f = 1, g, h, j = 1, k, l, m, o; +int main() { + struct a p; + int i; + p.b = 1; + if (!j) + goto q; + p.b = i = 0; + for (; i < 1; i++) + if (k) + while (m) + r: + q: + if (p.b) + g = 1; + while (1) { + i = 0; + for (; i < 5; i++) + ; + if (l) { + while (h) + ; + if (o) { + d = 0; + for (; d < 8; d++) + ; + } + } + for (; e; e--) + while (a) + p = n; + if (c) + goto r; + printf("0"); + if (f) + break; + } + return 0; +} diff --git a/gcc/testsuite/gcc.dg/torture/pr113707-2.c b/gcc/testsuite/gcc.dg/torture/pr113707-2.c new file mode 100644 index 00000000000..957e6f1b534 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr113707-2.c @@ -0,0 +1,26 @@ +/* { dg-do compile } */ + +int a, b, c, d, e, f, g, h, j, k, l; +void n() { + while (c) + if (1) { + for (h = 5; h; h--) { + int m = e % 2; + d = ~g || h ^ m / -1; + if (h > 5) + e = k; + } + return; + } +} +int main() { + if (a) + for (int i = 0; i < 2; i++) { + for (f = 1; f < 6; f++) + for (c = 7; c >= 0; c--) + if (l) + b = 0; + n(); + } + return 0; +} diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc index bbcf86588f9..8792cd07901 100644 --- a/gcc/tree-ssa-sccvn.cc +++ b/gcc/tree-ssa-sccvn.cc @@ -7776,6 +7776,11 @@ rpo_elim::eliminate_avail (basic_block bb, tree op) av = av->next; } while (av); + /* While we prefer avail we have to fallback to using the value + directly if defined outside of the region when none of the + available defs suit. */ + if (!valnum_info->visited) + return valnum; } else if (valnum != VN_TOP) /* valnum is is_gimple_min_invariant. */ -- 2.35.3