From patchwork Wed May 15 11:41:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1935560 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=gM/q6lZZ; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=RRAb6gfx; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=gM/q6lZZ; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=RRAb6gfx; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VfWXF30lrz1ymf for ; Wed, 15 May 2024 21:41:33 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 908893858D33 for ; Wed, 15 May 2024 11:41:31 +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 6AD783858D35 for ; Wed, 15 May 2024 11:41:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6AD783858D35 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 6AD783858D35 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=1715773268; cv=none; b=Y2dHCNhCYz9/IrZQ66dfxQpEbGqKQYj3unGhqwwpXI/Xia7w7HRvQCnk79jx1ICAK+YHMhyOXC6TbdwcNBmSseLL7whBRiq5RhH3g5o9THRIhJUm1lPzJdzCPHHyKvbwMhqdLVAEgEQxVWXNF8aZurUF8s7wE4pXbexSgwRx1YM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715773268; c=relaxed/simple; bh=pjrBRM1CRMoZmZy4z35uE0ret+KXRzUrkiCgb7YrglM=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version:Message-Id; b=WYsOKvfUcCaP8g7dRhfOHLC8L7wMbEsqvcu1mQRtZXNQOV+FLO57VlOnT63+0giKjSLe2NlJBYyqc1Fjf8SjHLWEX+K1iWmuDXAVGZct5LkLMxpL1n6szuPvwAtQVLWJBjAodkQQR99nRIVbfura0rf1L+qHfqNSk5g8BPYxPJg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (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 2E6BD205EE; Wed, 15 May 2024 11:41:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715773265; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=LjKHFlrOV2o6PYmS8Qdh9gvQZCIl0Tblrl+5LoaB1e4=; b=gM/q6lZZgyem76AXEnX2XZfoQIXfBLqlKKtRSi8KZXoGDIeBb2NWyvPJnc6eR7Ct3PXRkB p6j+ZCpeav7C2eImviZVdH8bOe3iYlryjtalFuZtCgauhMJGarnQno6ebPqEUxLAceDUCp f5y3u4blIg5ccodyec5xhVcrSjKIzsQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715773265; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=LjKHFlrOV2o6PYmS8Qdh9gvQZCIl0Tblrl+5LoaB1e4=; b=RRAb6gfxcI2ExWT4FUzpqgaIx2KD/KfueEOVk9YIN1KhjRFDK3Kou2wV9qyVWw8+45OQOY w2vuIydlUAZy0oDw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="gM/q6lZZ"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RRAb6gfx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715773265; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=LjKHFlrOV2o6PYmS8Qdh9gvQZCIl0Tblrl+5LoaB1e4=; b=gM/q6lZZgyem76AXEnX2XZfoQIXfBLqlKKtRSi8KZXoGDIeBb2NWyvPJnc6eR7Ct3PXRkB p6j+ZCpeav7C2eImviZVdH8bOe3iYlryjtalFuZtCgauhMJGarnQno6ebPqEUxLAceDUCp f5y3u4blIg5ccodyec5xhVcrSjKIzsQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715773265; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=LjKHFlrOV2o6PYmS8Qdh9gvQZCIl0Tblrl+5LoaB1e4=; b=RRAb6gfxcI2ExWT4FUzpqgaIx2KD/KfueEOVk9YIN1KhjRFDK3Kou2wV9qyVWw8+45OQOY w2vuIydlUAZy0oDw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (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 imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 0AA7F1372E; Wed, 15 May 2024 11:41:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id NrBnAFGfRGYePwAAD6G6ig (envelope-from ); Wed, 15 May 2024 11:41:05 +0000 Date: Wed, 15 May 2024 13:41:04 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: Jakub Jelinek Subject: [PATCH] middle-end/111422 - wrong stack var coalescing, handle PHIs MIME-Version: 1.0 Message-Id: <20240515114105.0AA7F1372E@imap1.dmz-prg2.suse.org> X-Spam-Level: X-Spamd-Result: default: False [-4.24 / 50.00]; BAYES_HAM(-2.73)[98.81%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_TWO(0.00)[2]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; MISSING_XM_UA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] X-Rspamd-Action: no action X-Rspamd-Queue-Id: 2E6BD205EE X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: -4.24 X-Spam-Status: No, score=-11.6 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org The gcc.c-torture/execute/pr111422.c testcase after installing the sink pass improvement reveals that we also need to handle _65 = &g + _58; _44 = &g + _43; # _59 = PHI <_65, _44> *_59 = 8; g = {v} {CLOBBER(eos)}; ... n[0] = &f; *_59 = 8; g = {v} {CLOBBER(eos)}; where we fail to see the conflict between n and g after the first clobber of g. Before the sinking improvement there was a conflict recorded on a path where _65/_44 are unused, so the real conflict was missed but the fake one avoided the miscompile. The following handles PHI defs in add_scope_conflicts_2 which fixes the issue. Bootstrapped on x86_64-unknown-linux-gnu, testing in progress. OK if that succeeds? Thanks, Richard. PR middle-end/111422 * cfgexpand.cc (add_scope_conflicts_2): Handle PHIs by recursing to their arguments. --- gcc/cfgexpand.cc | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gcc/cfgexpand.cc b/gcc/cfgexpand.cc index 557cb28733b..e4d763fa998 100644 --- a/gcc/cfgexpand.cc +++ b/gcc/cfgexpand.cc @@ -584,10 +584,23 @@ add_scope_conflicts_2 (tree use, bitmap work, || INTEGRAL_TYPE_P (TREE_TYPE (use)))) { gimple *g = SSA_NAME_DEF_STMT (use); - if (is_gimple_assign (g)) - if (tree op = gimple_assign_rhs1 (g)) - if (TREE_CODE (op) == ADDR_EXPR) - visit (g, TREE_OPERAND (op, 0), op, work); + if (gassign *a = dyn_cast (g)) + { + if (tree op = gimple_assign_rhs1 (a)) + if (TREE_CODE (op) == ADDR_EXPR) + visit (a, TREE_OPERAND (op, 0), op, work); + } + else if (gphi *p = dyn_cast (g)) + { + for (unsigned i = 0; i < gimple_phi_num_args (p); ++i) + if (TREE_CODE (use = gimple_phi_arg_def (p, i)) == SSA_NAME) + if (gassign *a = dyn_cast (SSA_NAME_DEF_STMT (use))) + { + if (tree op = gimple_assign_rhs1 (a)) + if (TREE_CODE (op) == ADDR_EXPR) + visit (a, TREE_OPERAND (op, 0), op, work); + } + } } }