From patchwork Tue Dec 5 07:25:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 173758 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp3263928vqy; Mon, 4 Dec 2023 23:29:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IGXVgr74neCG5P9BbuBj7k7fN5xHKdGe/c8m+P301aFPR4BFSXQQB3dTsGDegDETLmi+yex X-Received: by 2002:a05:622a:1897:b0:425:4043:8d37 with SMTP id v23-20020a05622a189700b0042540438d37mr867081qtc.82.1701761392791; Mon, 04 Dec 2023 23:29:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1701761392; cv=pass; d=google.com; s=arc-20160816; b=iBNkyigm2CVnf0EMaYUysm0G1bR5XZu7UfBA4vr9niB1QAXGonPC9E5F8W7Ynhn3+6 Gkc/YWioQFXwBGuX77LLl4FZEQQN+r7Un03I1lcCpD2RX498g0EyekHcUGvjLKPJmFb1 o9MjWSEEeTmjd8gC89LjnaZshOksHFSjGcINncRdQudaZ8X0fwVIGEboxqyTDORczD8X yy6e2/gL9Rrx6S8NzVmQZzLRO9MQ2G0iFMggUhVOzv08nNbrUECMNw4QOh6SO7HHI9FK qpYigiau33KGoNBSciLMb3NMJalgG1mK7Ow96otWAaSudvcEmRG2QQ8PumJdu62iSgiL vtxA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:errors-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:mime-version :subject:to:from:date:dkim-signature:dkim-signature:arc-filter :dmarc-filter:delivered-to; bh=Z0x2Y43GyrGoE6DYd7CKlC/yvj2Q2zaTRp0rIcPy8ak=; fh=hPrbWPhweUx4V0GV9uXJqbyAzg2ABmTz7kczrAQqMmM=; b=VzF1UHu2yu6je6vI8igd6FgxpGP3QPSSRdx5Dy0uvNSIXoEwjnMMMr7lApd77Giy8r pE1Kwn+Yrw5nda8cmPTkDTpol+7RljGHw82oyAcvafJCZJL3Drc6Y/IfBfYQqcy0Y5/E ulABVQ3H8XQ+RZFuPEhoJRu9yCaqINglsKtylvalpHCCYZFog6X6rsO7gDINQ0hYspqq l0QZuW/5B4Gpws3OQ7yT6Z0f3HnsCK+LChfTlQdP4whnVWUiLqDWWbSfybXCQF+nD93y 7uoyBP9/O4TqE9sjlQGiRR1QkjF9W2Mc1ii+xX0HBw4mrH03B+3w1Hc/gIfkReFeQBSI hEzA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=UsObW5wv; dkim=neutral (no key) header.i=@suse.de; arc=pass (i=1); 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=suse.de Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id gd26-20020a05622a5c1a00b0042383d2deedsi11939565qtb.614.2023.12.04.23.29.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 23:29:52 -0800 (PST) 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=@suse.de header.s=susede2_rsa header.b=UsObW5wv; dkim=neutral (no key) header.i=@suse.de; arc=pass (i=1); 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=suse.de Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8E9B63857022 for ; Tue, 5 Dec 2023 07:29:52 +0000 (GMT) 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 [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 6A4E13858D1E for ; Tue, 5 Dec 2023 07:29:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6A4E13858D1E 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 6A4E13858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701761370; cv=none; b=kUZcQWgPm87yoGiQcHf1WYys43/rWXiapzu5omTvo9gSC7GcJOIBGOc9P3n0qJ8gJcWm7V41oAuejfmMh5w+Oq5lUQTUkXyg365bgOt1KH7/hvTCvtHrtOrK2/gspoFWPbUsxgAWgIZcnb8gJVDrA6kgbsWAwArmoM2Gh+v9WL0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701761370; c=relaxed/simple; bh=0QueGGiWvB2tBOzwruo/pJV3HVulK1bB2uI90CLCfjE=; h=DKIM-Signature:DKIM-Signature:Date:From:To:Subject:MIME-Version; b=jynUWmDOpe2K/lzyp29iqYUOzNsdae3MSaJokB9Z498qYhUTgqsFPh85VHCXUqZRIKpqtTSsH04SYp1d3+l50n0ZSdHYLfeHIam5ZJgpZx70xRzCJ0ys+ZWjPevwZVurFzxCKzj21TzDD3Hr2nVdu2+u7+8px5IPO0oriMKR/Eg= 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-out2.suse.de (Postfix) with ESMTPS id 62D771FB72 for ; Tue, 5 Dec 2023 07:29:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1701761367; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=Z0x2Y43GyrGoE6DYd7CKlC/yvj2Q2zaTRp0rIcPy8ak=; b=UsObW5wva/DA2s1CKoJ3tjuRTm70JTYTT7E9WEdyOYW5pOqxP7BhJ8wBEYAV8uYm1rfQMp d+dTx7fTTZOs4TNwkDhsZMMEzfQkLvTDzcmbuqC5mpT+JlQPVZrpdOjWYImjVnNSXLozmu DfHRfhTVYeeIasdEyU9ohmm5AKX/fos= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1701761367; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=Z0x2Y43GyrGoE6DYd7CKlC/yvj2Q2zaTRp0rIcPy8ak=; b=iJZqtdE265nnV9UUpBPrpkZjgLDigoqkVsxdRljcJb0n62g2bORPCFFotQeoE0cdoNoHsY miDjAu37tc4bCbAQ== Date: Tue, 5 Dec 2023 08:25:43 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/112827 - more SCEV cprop fixes MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; none X-Spam-Score: 3.17 X-Spamd-Result: default: False [3.17 / 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]; NEURAL_SPAM_LONG(3.46)[0.987]; DBL_BLOCKED_OPENRESOLVER(0.00)[tree-scalar-evolution.cc:url]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-2.68)[98.61%] X-Spam-Status: No, score=-10.9 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Message-Id: <20231205072952.8E9B63857022@sourceware.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784426154190862173 X-GMAIL-MSGID: 1784426154190862173 The insert iteration can be corrupted by foldings of replace_uses_by, within this particular PHI replacement but also with subsequent ones. Recompute the insert location before insertion instead. This fixes an obvserved ICE of gcc.dg/tree-ssa/ssa-sink-16.c. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/112827 PR tree-optimization/112848 * tree-scalar-evolution.cc (final_value_replacement_loop): Compute the insert location for each insert. --- gcc/tree-scalar-evolution.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/tree-scalar-evolution.cc b/gcc/tree-scalar-evolution.cc index 065bcd0743d..38821ffb15a 100644 --- a/gcc/tree-scalar-evolution.cc +++ b/gcc/tree-scalar-evolution.cc @@ -3739,7 +3739,6 @@ final_value_replacement_loop (class loop *loop) split_loop_exit_edge (exit); /* Set stmt insertion pointer. All stmts are inserted before this point. */ - gimple_stmt_iterator gsi = gsi_after_labels (exit->dest); class loop *ex_loop = superloop_at_depth (loop, @@ -3883,6 +3882,7 @@ final_value_replacement_loop (class loop *loop) gsi_next (&gsi2); } } + gimple_stmt_iterator gsi = gsi_after_labels (exit->dest); gsi_insert_seq_before (&gsi, stmts, GSI_SAME_STMT); if (dump_file) {