From patchwork Thu Jul 13 08:52:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikael Morin X-Patchwork-Id: 119682 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1687101vqm; Thu, 13 Jul 2023 02:01:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlGhacZeWKROX29yVFB+FrUhqMr1W00rivtsH7put/zkwsd7kwguz82N/LSNKySpgjn6P1GV X-Received: by 2002:a17:906:9b:b0:978:8f29:8c85 with SMTP id 27-20020a170906009b00b009788f298c85mr748687ejc.32.1689238902829; Thu, 13 Jul 2023 02:01:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689238902; cv=none; d=google.com; s=arc-20160816; b=MLSyAvTGoeMOMwycJKHJ6urFe/iTfJssU2qkZ/FgUYVnu3JZOI5N+l3yHcM4kWqz4M XzdHr5c8dmQYT38Dx22H/kIw3P0Cvcjt0DCZP8dpfas1/Mft3ZKH5z+lmCeipv7ozHr8 b5yuXlwwYenuNbzsWzn8CTxz+8AZRRnkfD2ewQ/GkR1nt1prL5d/6cj3JYd8mY9Hy/Yh x5vY2rW90mGSeq9EU4t8TZCgsOT87CQqcnQ+kdbA9BdtJ8knNuNrjLUnoGv0sfTumjkU mzfxxzJMh8DuNtUwtcxvYFrCnMmzIgIyaNtW9zbi0E3ZKRXWBDEgSO6XxrxwSWW/nmNQ 1duw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=2JCzZOcOZjw7wb2lYFy5sUJnZzT9SidF42BCKXmPfPA=; fh=EAqAZnhg4AYtcBjfPm18lEF5V0R2rkI9MSWQf+svVaI=; b=rJK8MvcQHTOiJvJ0c8usA7veubC0dmOf7B4DY+YAUCXodaP622wCnbxHlwDABgpswW olpEaQrH54YPHA9PxR0RO5ch4yM5dvlSyKfUmJ1lMkViW9a2ewmZOMmN+ObPAGAMecJr WivI1VhV/t6EokZ0tVqbYPrrehBpArP1NTdZcTWnSfjJYRx4EHoqYXrASp4Y+f7s1p5v SjgLxWaAigmdA2KzVv/GD/xT0EQqIUQARVGdqC1KTlKFBD4wU3wjwUTMWlAmDkb+Xg7Z miIL8RfpSiXUzfBSjH3/xTPrc4EAkY/xCLZekQJVZGuptZCO692MLg+FOPxCOs5MU/Pq 6GVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="Jl/fo+0J"; 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=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id f11-20020a170906824b00b0098dfdc3f2e6si6713003ejx.982.2023.07.13.02.01.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 02:01:42 -0700 (PDT) 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=@gcc.gnu.org header.s=default header.b="Jl/fo+0J"; 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=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EFF15388B6B3 for ; Thu, 13 Jul 2023 08:55:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EFF15388B6B3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689238548; bh=2JCzZOcOZjw7wb2lYFy5sUJnZzT9SidF42BCKXmPfPA=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Jl/fo+0J8vR4DoOenAyqk6/hLP/1H4NLLGMz/IQSDRG6j1sGSzx7NZrqnLarIdVGA gIh7UaB6naK48Ri3lJUlKv0HN8PRRVJd+0pzgFUHkjZetLLj0odVNTrQaUstjR+AD4 6weKEUpRzk8FpP77tj8v50kVYJ7J6xNdRLBGPLY8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.smtpout.orange.fr (smtp-14.smtpout.orange.fr [80.12.242.14]) by sourceware.org (Postfix) with ESMTPS id CED13385783F for ; Thu, 13 Jul 2023 08:52:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CED13385783F Received: from cyrano.home ([86.215.161.51]) by smtp.orange.fr with ESMTPA id Js3wqzoJKtImzJs45q0yWE; Thu, 13 Jul 2023 10:52:45 +0200 X-ME-Helo: cyrano.home X-ME-Auth: bW9yaW4tbWlrYWVsQG9yYW5nZS5mcg== X-ME-Date: Thu, 13 Jul 2023 10:52:45 +0200 X-ME-IP: 86.215.161.51 To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 12/14] fortran: Factor scalar descriptor generation Date: Thu, 13 Jul 2023 10:52:34 +0200 Message-Id: <20230713085236.330222-13-mikael@gcc.gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230713085236.330222-1-mikael@gcc.gnu.org> References: <20230713085236.330222-1-mikael@gcc.gnu.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NEUTRAL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=unavailable 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Mikael Morin via Gcc-patches From: Mikael Morin Reply-To: Mikael Morin Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771295371961202012 X-GMAIL-MSGID: 1771295371961202012 The same scalar descriptor generation code is present twice, in the case of derived type entities, and in the case of polymorphic non-coarray entities. Factor it in preparation for a future third case that will also need the same code for scalar descriptor generation. gcc/fortran/ChangeLog: * trans.cc (get_var_descr): Factor scalar descriptor generation. --- gcc/fortran/trans.cc | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/gcc/fortran/trans.cc b/gcc/fortran/trans.cc index 731dfb626ab..69e9329c9cb 100644 --- a/gcc/fortran/trans.cc +++ b/gcc/fortran/trans.cc @@ -1146,7 +1146,6 @@ static void get_var_descr (gfc_se *se, gfc_expr *var) { gfc_se tmp_se; - symbol_attribute attr; gcc_assert (var); @@ -1164,13 +1163,6 @@ get_var_descr (gfc_se *se, gfc_expr *var) { gfc_conv_expr (&tmp_se, var); // gcc_assert (se.pre.head == NULL_TREE && se.post.head == NULL_TREE); - - /* No copy back needed, hence set attr's allocatable/pointer - to zero. */ - gfc_clear_attr (&attr); - tmp_se.expr = gfc_conv_scalar_to_descriptor (&tmp_se, tmp_se.expr, - attr); - gcc_assert (tmp_se.post.head == NULL_TREE); } } else @@ -1191,20 +1183,25 @@ get_var_descr (gfc_se *se, gfc_expr *var) gfc_add_data_component (array_expr); gfc_conv_expr (&tmp_se, array_expr); gcc_assert (tmp_se.post.head == NULL_TREE); - - if (!gfc_is_coarray (array_expr)) - { - /* No copy back needed, hence set attr's allocatable/pointer - to zero. */ - gfc_clear_attr (&attr); - tmp_se.expr = gfc_conv_scalar_to_descriptor (&tmp_se, tmp_se.expr, - attr); - } - gcc_assert (tmp_se.post.head == NULL_TREE); } gfc_free_expr (array_expr); } + if (var->rank == 0) + { + if (var->ts.type == BT_DERIVED + || !gfc_is_coarray (var)) + { + /* No copy back needed, hence set attr's allocatable/pointer + to zero. */ + symbol_attribute attr; + gfc_clear_attr (&attr); + tmp_se.expr = gfc_conv_scalar_to_descriptor (&tmp_se, tmp_se.expr, + attr); + } + gcc_assert (tmp_se.post.head == NULL_TREE); + } + if (!POINTER_TYPE_P (TREE_TYPE (tmp_se.expr))) tmp_se.expr = gfc_build_addr_expr (NULL, tmp_se.expr);