From patchwork Mon Dec 4 09:35:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 173150 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2647269vqy; Mon, 4 Dec 2023 01:35:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IExOS3Y9rrSboviTgjJGtqyey2/cxctv8D/JZQvPv1gceUM37TDOYKeBcp1lC4uzaK5oI9G X-Received: by 2002:aca:1901:0:b0:3b8:b063:a1e4 with SMTP id l1-20020aca1901000000b003b8b063a1e4mr4781148oii.110.1701682532106; Mon, 04 Dec 2023 01:35:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1701682532; cv=pass; d=google.com; s=arc-20160816; b=XuhVTw5+yGNvoguK9FbI04Dsaj3pvKpg3h2QCJ1SFNAgHGmAkT62P+IYeFu4otmf4j urCXdlA5R/FLU0H7aEfjUxdUP6/4jeHL1PTnJS7rhRDRFtjc2RaJep069xWVV4kUKxwl AXdolIB08nmRSdV6tvV4t9RnC5RGaKPsnoPcvpUCvM7PqzdqV2OVv1AewHAlwdCfdNxG 1IQWp87NJjjdQbEV4vwF5GFEShvO0Sn/I2YAzTJHsE2LNYvWyfohqeYhVQpRyIQVBi8D 4M0g3q5P1b+68iW9JmWR8oQ1tEfw3BQjnSLbhDSWil6XhXyczAo/6/uUY2Pr5jArSJCr JWEw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:message-id:mime-version:subject :cc:to:from:date:dkim-signature:dkim-signature:arc-filter :dmarc-filter:delivered-to; bh=Z2p81qKSXTA9n6C+ZDMh2MPdIKCvsAVn5m+8hH5ucBw=; fh=gSYembJIQudd+PvT0IV+g5bEjdJejrB7/Kk1rZi5kHg=; b=eCQ2hjg1vEtHpixTRruPkbsDjtBiojw+Etp912CNtLNaXTGaK+AK3HobKhuV+wIlJE vmAlTn9JLCNpoSdVtpp/40D6vMXKzJLGwiS0/Yd3+41cNpcXIEi76nr1yv2g0LGqQT/2 BJ+VTC8bCY90R8hcgSPqMn1FRBITA0vvcJm8twmR+i3ZvxyexJ2Opq53NMpdIVdysGmx UDznr0S1Fo+aX2w3QJCeoz0yOVl5Yzolsigfm4ZNz3f0qrKc0vWTDhRt9pTYwdnEP1/4 Va3wsA2xWRH53YXJl9S5WOnTlyxD2OSYvlChESayMtppTtWE+obZiTjuGfa5X9pn6tPx RqRQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=0N6WK2tS; 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 i15-20020a05620a248f00b0077d5f6e1e47si9313646qkn.403.2023.12.04.01.35.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 01:35:32 -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=0N6WK2tS; 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 D9CF538582AC for ; Mon, 4 Dec 2023 09:35: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 [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 15C3D3858410 for ; Mon, 4 Dec 2023 09:35:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 15C3D3858410 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 15C3D3858410 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701682509; cv=none; b=ojvjNYNsGY5wwrNej1n3cUDOvFbxROM7pTQPt+vY8ghImFesOE79WmhwtMKOP31wMjQc5ok2rqKr2LAzE6r67oo1OWb3kfXNlh1RueuIbDb1NjPANMusQ9YNN1VrDGMZ7J4Ucu0gQVT7ksG7CJszUXNvonN6pUXmqTQNWc/zOhk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701682509; c=relaxed/simple; bh=8IKVShaEeWXXDb5okW6I+lvIbdKGXJojWWf6iDSEozw=; h=DKIM-Signature:DKIM-Signature:Date:From:To:Subject:MIME-Version: Message-Id; b=NBqPeIy0tGXGAN3+dk2sxkzaqi4j0GDstsCMlp8GbXYAcxEOJcSbxDHIhFkeCxkwpvWmSdwRFuGbVcE+4I8qehoYMXBCNpk6V/s/fhx68gdresJP5mmDixavvM2cxo4vhOKIldbtEIINN4SHzUnGTmfqpJM5zj4ChuLHOZtD/EA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (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 1706E1FE5F; Mon, 4 Dec 2023 09:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1701682507; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=Z2p81qKSXTA9n6C+ZDMh2MPdIKCvsAVn5m+8hH5ucBw=; b=0N6WK2tS0XiUDtlTwS4RrH5v/66pFH7Vp6Z7vnwLHisb6CSO7iOh140Y9aWpfkwGNvoxxc fGQ7s9X5QTh/FEX4A2T4iafY9mDF7FixJy+fzyRNKjzr7QEtfrS2Omc+pZ6s7L5DJA7w/R AVfgUGbfceWczv8vJnWb3cWB1jEcdEw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1701682507; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=Z2p81qKSXTA9n6C+ZDMh2MPdIKCvsAVn5m+8hH5ucBw=; b=0FAGe8ea8zew+LU7jzc14o+89ZrQa+cw0b/LUR1jSMAWaBCd7DfuKqNZNaX1ffjKeC4wIB oSulrtmA0EBPKKCA== Received: from imap2.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 imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id E9DA913588; Mon, 4 Dec 2023 09:35:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id 2pNiN0qdbWUcMQAAn2gu4w (envelope-from ); Mon, 04 Dec 2023 09:35:06 +0000 Date: Mon, 4 Dec 2023 10:35:06 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: "Joseph S. Myers" Subject: [PATCH 1/2][RFC] middle-end/112830 - memcpy expansion drops address-spaces MIME-Version: 1.0 Message-Id: <20231204093506.E9DA913588@imap2.dmz-prg2.suse.org> Authentication-Results: smtp-out2.suse.de; none X-Spam-Level: X-Spam-Score: -4.10 X-Spamd-Result: default: False [-4.10 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_TWO(0.00)[2]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784343462966668022 X-GMAIL-MSGID: 1784343462966668022 The following makes sure we are not losing address-space info when expanding a __builtin_memcpy (synthesized by gimplification, which _might_ be the other actual problem). The issue is with get_memory_rtx which is also used by other builtin expansions but is not aware of address-spaces. The following fixes that which resolves an ICE with AVR and properly dispatches to inline expansion then in emit_block_move_hints. The alternative, to not intoduce memcpy by gimplification is possible but IL verification rejects WITH_SIZE_EXPR as part of GIMPLE assignments, removing that restriction also "works" (for the testcase). Alternative is in [2/2]. Sofar untested, will test on x86_64 - in principle I'd prefer 2/2. Richard. PR middle-end/112830 * builtins.cc (get_memory_rtx): Make address-space aware. * gcc.target/avr/pr112830.c: New testcase. --- gcc/builtins.cc | 10 +++++++--- gcc/testsuite/gcc.target/avr/pr112830.c | 11 +++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/avr/pr112830.c diff --git a/gcc/builtins.cc b/gcc/builtins.cc index 4fc58a0bda9..05c50b782d7 100644 --- a/gcc/builtins.cc +++ b/gcc/builtins.cc @@ -1353,7 +1353,8 @@ get_memory_rtx (tree exp, tree len) exp = TREE_OPERAND (exp, 0); addr = expand_expr (orig_exp, NULL_RTX, ptr_mode, EXPAND_NORMAL); - mem = gen_rtx_MEM (BLKmode, memory_address (BLKmode, addr)); + addr_space_t as = TYPE_ADDR_SPACE (TREE_TYPE (TREE_TYPE (exp))); + mem = gen_rtx_MEM (BLKmode, memory_address_addr_space (BLKmode, addr, as)); /* Get an expression we can use to find the attributes to assign to MEM. First remove any nops. */ @@ -1363,8 +1364,11 @@ get_memory_rtx (tree exp, tree len) /* Build a MEM_REF representing the whole accessed area as a byte blob, (as builtin stringops may alias with anything). */ + tree ctype = char_type_node; + if (!ADDR_SPACE_GENERIC_P (as)) + ctype = build_qualified_type (ctype, ENCODE_QUAL_ADDR_SPACE (as)); exp = fold_build2 (MEM_REF, - build_array_type (char_type_node, + build_array_type (ctype, build_range_type (sizetype, size_one_node, len)), exp, build_int_cst (ptr_type_node, 0)); @@ -1381,7 +1385,7 @@ get_memory_rtx (tree exp, tree len) unsigned int align = get_pointer_alignment (TREE_OPERAND (exp, 0)); exp = build_fold_addr_expr (base); exp = fold_build2 (MEM_REF, - build_array_type (char_type_node, + build_array_type (ctype, build_range_type (sizetype, size_zero_node, NULL)), diff --git a/gcc/testsuite/gcc.target/avr/pr112830.c b/gcc/testsuite/gcc.target/avr/pr112830.c new file mode 100644 index 00000000000..576107b9909 --- /dev/null +++ b/gcc/testsuite/gcc.target/avr/pr112830.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ + +typedef __SIZE_TYPE__ size_t; + +void copy_n (void *vdst, const __memx void *vsrc, size_t n) +{ + typedef struct { char a[n]; } T; + T *dst = (T*) vdst; + const __memx T *src = (const __memx T*) vsrc; + *dst = *src; +} From patchwork Mon Dec 4 09:35:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 173153 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2647472vqy; Mon, 4 Dec 2023 01:36:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IHkI6I/PCDHhocDEZSxQeoAN7JQwxL8vdtq4CJx8KxG1A9vMDTIb5IMT4jxFKrdwHhWlzyr X-Received: by 2002:a05:622a:e:b0:425:4043:7630 with SMTP id x14-20020a05622a000e00b0042540437630mr5308789qtw.88.1701682566073; Mon, 04 Dec 2023 01:36:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1701682566; cv=pass; d=google.com; s=arc-20160816; b=TmWv8kHPxW/BzjlIph5zyvI5sTK1MD1zuXidYN/brpkWxzEZ0dLS3LoPux9JY2xkSj DdyxPebjZ6PckbMVZxa8373tt2gKSMBKKa3vVbJEy/JWwBdLKIiQUBG93v+dFUp5uxgb oRaD3gKQeHP6L3Dx2W8s2TVeCoIaTXeB7jl5258b8IBBBrOLOPVlK2ELCjIttPksmvIh L8QKdUFcop0fyi9xKBsUA3/nK5zzxGAI5Xmlqb4IjwCqxAjcLcGvS0xBO41Ih4ma4fAq /CVbJKdW6M5IkxP7nFlVoTBtymNH0eJO4DQyrVraYH/vU90AlDOxA4QnMqOw3/D2rYxP rklg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:message-id:mime-version:subject :cc:to:from:date:arc-filter:dmarc-filter:delivered-to; bh=hQlt7OzYn4LxHd2iHM4ReSI8DxKyeQWpz0QYWnMCpuk=; fh=gSYembJIQudd+PvT0IV+g5bEjdJejrB7/Kk1rZi5kHg=; b=S16npTAFVa3jr6FaQxj6q4h1xrd3fuhVZqXzBBh55vdE7Rot4CaSa3ZgZ9p90TX1wN ydfy1vpR+3pRY2GQ5JrMuFpCEAeGS4jEdWSN5WEZ1vyQx55SNSOHk4W41pzJWA+U3s+6 H6I3nZyhuQ7bCb8t14w9KkjyU5IL/Ta7wBsP4akYDgitM+TW/dER0WZ8+SPgud70vnl9 GTUnOW90IVgFBrmw6rwCX/RtUF7UKa355bOP/XH4P6X28EmDfUuHIzbsLcFfy3hCzo7o FCdH3TtDU2rYtaTEbVytS+mSxJLmTFpaCIZybHnw0UcHkLTOaH3CvgXLce+YBEqThtZW 7qlw== ARC-Authentication-Results: i=2; mx.google.com; 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=fail (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 z19-20020ac87113000000b004237660db14si8774225qto.338.2023.12.04.01.36.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 01:36:06 -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; 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=fail (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 D0F6D3857C71 for ; Mon, 4 Dec 2023 09:36:05 +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 [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id BB0B9385773F for ; Mon, 4 Dec 2023 09:35:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BB0B9385773F 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 BB0B9385773F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701682543; cv=none; b=lKYVhihsthgqKy/jXjbz8l9CkxszdKv4uFrzbjQUO0l2MwlMfYBRtL95yfQKK1+cNBdUhi6Icj1RpsFNYAP8/as/Uq6/XHwex0H5t7G18t323EMt9qvWmhS/EuXXoNB9zS+lcmEfTenItrF7XNYCrnwuBIO5+tkdJD82Q2+7BDI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701682543; c=relaxed/simple; bh=+SCgkPK20TNxhV7Qpr4Xwt3zzpd8wReOS2T6TQLeuwE=; h=Date:From:To:Subject:MIME-Version:Message-Id; b=J4kK7rQI9+WjZg/gxwvd8y8yqoOxhRIgytmLc/m45SMDy8Go4mvvoK9bAvGEx/x2+2JzVUCTDcaJB3iasOpOKmk1v935SoLPK/33RumsCj7kb+U3jx8UeGw3KEo4ZmGFDXowk6sFmcutbgnSO+61NStTgwCe9Q1o5z2axkpulco= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:98]) (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 88F601FE5F; Mon, 4 Dec 2023 09:35:38 +0000 (UTC) Received: from imap2.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 imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 661DF13588; Mon, 4 Dec 2023 09:35:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id p1JTF2qdbWU9MQAAn2gu4w (envelope-from ); Mon, 04 Dec 2023 09:35:38 +0000 Date: Mon, 4 Dec 2023 10:35:38 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: "Joseph S. Myers" Subject: [PATCH 2/2] middle-end/112830 - avoid gimplifying non-default addr-space assign to memcpy MIME-Version: 1.0 Message-Id: <20231204093538.661DF13588@imap2.dmz-prg2.suse.org> X-Spamd-Bar: +++++++++ Authentication-Results: smtp-out2.suse.de; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=suse.de (policy=none); spf=softfail (smtp-out2.suse.de: 2a07:de40:b281:104:10:150:64:98 is neither permitted nor denied by domain of rguenther@suse.de) smtp.mailfrom=rguenther@suse.de X-Rspamd-Server: rspamd2 X-Spamd-Result: default: False [9.68 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:98:from]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_SPF_SOFTFAIL(4.60)[~all:c]; RCVD_COUNT_THREE(0.00)[3]; MX_GOOD(-0.01)[]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_SPAM_LONG(2.89)[0.826]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(2.20)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.01)[45.82%]; DMARC_POLICY_SOFTFAIL(0.10)[suse.de : No valid SPF, No valid DKIM,none] X-Spam-Score: 9.68 X-Rspamd-Queue-Id: 88F601FE5F X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784343498184154468 X-GMAIL-MSGID: 1784343498184154468 The following avoids turning aggregate copy or initialization involving non-default address-spaces to memcpy or memset since they are not prepared for that. GIMPLE verification no longer(?) accepts WITH_SIZE_EXPR in aggregate copies, the following re-allows that. Sofar untested, will test on x86_64-unknown-linux-gnu. This is the variant I prefer. Richard. PR middle-end/112830 * gimplify.cc (gimplify_modify_expr): Avoid turning aggregate copy or initialization non-default address-spaces to memcpy or memset. * tree-cfg.cc (verify_gimple_assign_single): Allow WITH_SIZE_EXPR as part of the RHS of an assignment. --- gcc/gimplify.cc | 11 +++++++---- gcc/tree-cfg.cc | 16 ++++++++++------ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc index 02f85e7109b..a1d5ee28cbe 100644 --- a/gcc/gimplify.cc +++ b/gcc/gimplify.cc @@ -6331,7 +6331,8 @@ gimplify_modify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p, && TYPE_SIZE_UNIT (TREE_TYPE (*from_p)) && !poly_int_tree_p (TYPE_SIZE_UNIT (TREE_TYPE (*from_p))) && TREE_CODE (*from_p) == CONSTRUCTOR - && CONSTRUCTOR_NELTS (*from_p) == 0) + && CONSTRUCTOR_NELTS (*from_p) == 0 + && ADDR_SPACE_GENERIC_P (TYPE_ADDR_SPACE (TREE_TYPE (*to_p)))) { maybe_with_size_expr (from_p); gcc_assert (TREE_CODE (*from_p) == WITH_SIZE_EXPR); @@ -6464,10 +6465,12 @@ gimplify_modify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p, tree from = TREE_OPERAND (*from_p, 0); tree size = TREE_OPERAND (*from_p, 1); - if (TREE_CODE (from) == CONSTRUCTOR) + if (!ADDR_SPACE_GENERIC_P (TYPE_ADDR_SPACE (TREE_TYPE (*to_p))) + || !ADDR_SPACE_GENERIC_P (TYPE_ADDR_SPACE (TREE_TYPE (from)))) + ; + else if (TREE_CODE (from) == CONSTRUCTOR) return gimplify_modify_expr_to_memset (expr_p, size, want_value, pre_p); - - if (is_gimple_addressable (from)) + else if (is_gimple_addressable (from)) { *from_p = from; return gimplify_modify_expr_to_memcpy (expr_p, size, want_value, diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc index a30a2de33a1..3917bee5a92 100644 --- a/gcc/tree-cfg.cc +++ b/gcc/tree-cfg.cc @@ -4673,6 +4673,16 @@ verify_gimple_assign_single (gassign *stmt) error ("%qs in gimple IL", code_name); return true; + case WITH_SIZE_EXPR: + if (!is_gimple_val (TREE_OPERAND (rhs1, 1))) + { + error ("invalid WITH_SIZE_EXPR size argument in load"); + debug_generic_stmt (lhs); + debug_generic_stmt (rhs1); + return true; + } + rhs1 = TREE_OPERAND (rhs1, 0); + /* Fallthru. */ case COMPONENT_REF: case BIT_FIELD_REF: case ARRAY_REF: @@ -4810,12 +4820,6 @@ verify_gimple_assign_single (gassign *stmt) } return res; - case WITH_SIZE_EXPR: - error ("%qs RHS in assignment statement", - get_tree_code_name (rhs_code)); - debug_generic_expr (rhs1); - return true; - case OBJ_TYPE_REF: /* FIXME. */ return res;