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: 81264 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 03A423857B93 for ; Mon, 4 Dec 2023 09:35:58 +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+patchwork=sourceware.org@gcc.gnu.org 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;