From patchwork Wed Dec 13 09:06:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 177823 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp7641107dys; Wed, 13 Dec 2023 01:08:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IH/meMgJWQ+LTGwi596pOk/7hc897qnt/nJoHfe1ut4TRxMwTrbtLfX3D0Y97LYMr5Y+wWN X-Received: by 2002:a05:622a:1352:b0:423:b722:940b with SMTP id w18-20020a05622a135200b00423b722940bmr11303353qtk.7.1702458480644; Wed, 13 Dec 2023 01:08:00 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702458480; cv=pass; d=google.com; s=arc-20160816; b=y3Igd7q91TmdW+v4wmTWDSkpZrrIQiq7D0bKa88QFhLS4zbxSIOEyUzt/VM+zis+dh 9Z7kFVReXt3H8DjgQZezfj1YSA8r5e7qvdbioKtuXx44/h05T3Tzh8aeSlghhYc2/sTY 03Quys8CRAMSuwHGFKtEK0pvtQfV12WZTBWqTC5UsrcVTGWJ3vpgmIhk+HDbYuGyevR9 KlWq7YvawJj84u1AFTH25O2+ayJdCPB6hstZ+1eSMNLpVOrBOAqNKNpkRHU9rTCoO+nW VJfLzLaPhB4OZorvmjFlk7jmvZrVhsP8XnOZEx0jfHuSAz1Kb4BggZ8aQKF2Q/0R+NFr Hn4w== 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:dkim-signature :dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=l5ORmlqcDw0F9+GlLdQQgKu/hTZbMwm+sHYQJNr0+T8=; fh=hPrbWPhweUx4V0GV9uXJqbyAzg2ABmTz7kczrAQqMmM=; b=NquF8VKbJqs/FYw1uyM1eodci14jR6QdcWtys/AUtBthmnHsSFWmmV4yALwTLTzsMm 9GFvHlYMGbGFE7umrhCIhh3aj1W3WzIysFyb00v0d0jWu/VuLty6yjlKAIOllr/evOQl z7eDgf3JYBvxzRUgA4g5btGHnG+kfMpyys+wF2ocE1Wv2zOSDAZqUEC4WUHBKvOkp05V L6demCwJztk+WmxIAX078y4xtYxa9k49hEPRfrtjsQ+xysAKmDeDYnRajwcynICoaS4a qPHfXl0IfCGIRVBW3PvKr+5VPJ8q2cBWqqSYMp8SSf/NML7bIxgFWsBvTa35KLabXDhV 5xKQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=axGxf2L9; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=vA5hwFlf; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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. [8.43.85.97]) by mx.google.com with ESMTPS id u34-20020a05622a19a200b004259f6d6eddsi12629983qtc.93.2023.12.13.01.08.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 01:08:00 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=axGxf2L9; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=vA5hwFlf; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 5F671385B526 for ; Wed, 13 Dec 2023 09:08:00 +0000 (GMT) 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:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id D2B143858D39 for ; Wed, 13 Dec 2023 09:07:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D2B143858D39 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 D2B143858D39 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=1702458456; cv=none; b=A2Dc78Q8GNM5UL1S0sVh1thAWEIPPE9Wiy1AthqTdnk0oPBumJkCEGsxwgVeduSeI9fko37sjdbnvhpp3rPEubeieEWTTtfI3Oinp6gW08nJIpnV1PKYvMWL8ge1RhqU5xPPCK9isxHZEWCPFA9HEkyxVAja6hWNjhq6ObA63xs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702458456; c=relaxed/simple; bh=7fOORen5pX3MAhG1nxtPBoap0B//U9jE3uzcTY3VotI=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=rSOUjdb9VNbFPfpjGrbJFkOLg6bnDjyakoSismtZk2RVzVQBj6tMXxLBqge5fY9U26bfmp/rqs5v+KlH1EN7PqE5mQ0ZjEIICYB1EFZlO4w3IdwsXbYwes6FHC4sUGla6+btRmjCKH616gZCGZLRoXjv2TFBN0gFVgGizmXqkeY= 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 B500C2256C for ; Wed, 13 Dec 2023 09:07:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702458446; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=l5ORmlqcDw0F9+GlLdQQgKu/hTZbMwm+sHYQJNr0+T8=; b=axGxf2L9PsHBvaLDwN9cegHajf1xNjnx6JRioemYkT+5lth6A05pnqlyjAM/XSuR+LEFvD WDt6qrTV4LfKRO249lnECzUzwAo5z1170t1TAF0y4qc4lndw6YG0ZQzqZgiuuPqmwa2jAJ DIgNZT459s/IWPyzBvh6j0emgscboSQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702458446; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=l5ORmlqcDw0F9+GlLdQQgKu/hTZbMwm+sHYQJNr0+T8=; b=8cGsWc6FB7LouTDBryV86tR63+VFEOWDRsDskQcvWIQoMXYmWsuTYAiI5IVJF/XMZ8aj2y HAVPcYvzdY3tZCBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702458444; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=l5ORmlqcDw0F9+GlLdQQgKu/hTZbMwm+sHYQJNr0+T8=; b=vA5hwFlf0OEIl+j5kcoWalgtJysG99knUm7LssJZg0Isa8csp8iWjhB0eb7BZiENcqtmLl vezCmotwIjoygZRKo/T3CX7++c/MiC7P/UG4lyBqVcXTIyzxp8vG5mlxxEDJ2j9Sl39RkG PbEWdxSH+uLqpReo9iCjFU8olk4/fCE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702458444; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=l5ORmlqcDw0F9+GlLdQQgKu/hTZbMwm+sHYQJNr0+T8=; b=LpEt5v0yVuuf9ixfgo3E+2qTlVNjDLj1mcr/ulethOmPakfT950R9lI+nu5kZwQf1yV6tR 3odKtZfVwut/NADg== Date: Wed, 13 Dec 2023 10:06:20 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] Avoid losing MEM_REF offset in MEM_EXPR adjustment for stack slot sharing MIME-Version: 1.0 X-Spam-Score: 4.04 X-Spam-Flag: NO Authentication-Results: smtp-out1.suse.de; none X-Spamd-Result: default: False [1.40 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; 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]; DBL_BLOCKED_OPENRESOLVER(0.00)[emit-rtl.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(-0.00)[11.25%] X-Spam-Score: 1.40 X-Spam-Status: No, score=-10.8 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: <20231213090800.5F671385B526@sourceware.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785157103356035776 X-GMAIL-MSGID: 1785157103356035776 When investigating PR111591 with respect to TBAA and stack slot sharing I noticed we're eventually scrapping a [TARGET_]MEM_REF offset when rewriting the VAR_DECL base of the MEM_EXPR to use a pointer to the partition instead. The following makes sure to preserve that. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. * emit-rtl.cc (set_mem_attributes_minus_bitpos): Preserve the offset when rewriting an exising MEM_REF base for stack slot sharing. --- gcc/emit-rtl.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/emit-rtl.cc b/gcc/emit-rtl.cc index 84b6833225e..4a7e420e7c0 100644 --- a/gcc/emit-rtl.cc +++ b/gcc/emit-rtl.cc @@ -2128,9 +2128,15 @@ set_mem_attributes_minus_bitpos (rtx ref, tree t, int objectp, tree *orig_base = &attrs.expr; while (handled_component_p (*orig_base)) orig_base = &TREE_OPERAND (*orig_base, 0); - tree aptrt = reference_alias_ptr_type (*orig_base); - *orig_base = build2 (MEM_REF, TREE_TYPE (*orig_base), *namep, - build_int_cst (aptrt, 0)); + if (TREE_CODE (*orig_base) == MEM_REF + || TREE_CODE (*orig_base) == TARGET_MEM_REF) + TREE_OPERAND (*orig_base, 0) = *namep; + else + { + tree aptrt = reference_alias_ptr_type (*orig_base); + *orig_base = build2 (MEM_REF, TREE_TYPE (*orig_base), + *namep, build_int_cst (aptrt, 0)); + } } }