From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id A64AD3858034 for ; Mon, 24 May 2021 14:06:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A64AD3858034 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-525-3PqC_KmmNGWa_gM7wKHf8A-1; Mon, 24 May 2021 10:06:56 -0400 X-MC-Unique: 3PqC_KmmNGWa_gM7wKHf8A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 26B9F106BAF1; Mon, 24 May 2021 14:06:55 +0000 (UTC) Received: from tucnak.zalov.cz (ovpn-114-118.ams2.redhat.com [10.36.114.118]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C576E60C05; Mon, 24 May 2021 14:06:54 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.16.1/8.16.1) with ESMTPS id 14OE6pYv3930257 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 24 May 2021 16:06:51 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.16.1/8.16.1/Submit) id 14OE6oSA3930256; Mon, 24 May 2021 16:06:50 +0200 Date: Mon, 24 May 2021 16:06:50 +0200 From: Jakub Jelinek To: Tobias Burnus Cc: gcc-patches , fortran Subject: Re: [Patch] OpenMP/Fortran: Handle polymorphic scalars in data-sharing FIRSTPRIVATE [PR86470] Message-ID: <20210524140650.GC1179226@tucnak> Reply-To: Jakub Jelinek References: <9b270c75-b88c-7477-1303-5f4f5a6662ae@codesourcery.com> MIME-Version: 1.0 In-Reply-To: <9b270c75-b88c-7477-1303-5f4f5a6662ae@codesourcery.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-5.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2021 14:07:00 -0000 On Wed, Mar 10, 2021 at 11:55:43AM +0100, Tobias Burnus wrote: > --- a/gcc/fortran/trans-openmp.c > +++ b/gcc/fortran/trans-openmp.c > @@ -360,6 +360,39 @@ gfc_has_alloc_comps (tree type, tree decl) > return false; > } > > +/* Return true if TYPE is polymorphic but not with pointer attribute. */ > + > +static bool > +gfc_is_polymorphic_nonptr (tree type) > +{ > + if (POINTER_TYPE_P (type)) > + type = TREE_TYPE (type); > + return GFC_CLASS_TYPE_P (type); > +} > + > +/* Return true if TYPE is unlimited polymorphic but not with pointer attribute; > + unlimited means also intrinsic types are handled and _len is used. */ > + > +static bool > +gfc_is_unlimited_polymorphic_nonptr (tree type) > +{ > + if (POINTER_TYPE_P (type)) > + type = TREE_TYPE (type); > + if (!GFC_CLASS_TYPE_P (type)) > + return false; > + > + tree field = TYPE_FIELDS (type); /* _data */ > + gcc_assert (field); > + field = DECL_CHAIN (field); /* _vptr */ > + gcc_assert (field); > + field = DECL_CHAIN (field); > + if (!field) > + return false; > + gcc_assert (0 == strcmp ("_len", IDENTIFIER_POINTER (DECL_NAME (field)))); strcmp (...) == 0 instead please. > + return true; > +} > + > + > /* Return true if DECL in private clause needs > OMP_CLAUSE_PRIVATE_OUTER_REF on the private clause. */ > bool > @@ -743,12 +776,88 @@ tree > gfc_omp_clause_copy_ctor (tree clause, tree dest, tree src) > { > tree type = TREE_TYPE (dest), ptr, size, call; > + tree decl_type = TREE_TYPE (OMP_CLAUSE_DECL (clause)); > tree cond, then_b, else_b; > stmtblock_t block, cond_block; > > gcc_assert (OMP_CLAUSE_CODE (clause) == OMP_CLAUSE_FIRSTPRIVATE > || OMP_CLAUSE_CODE (clause) == OMP_CLAUSE_LINEAR); > > + if (DECL_ARTIFICIAL (OMP_CLAUSE_DECL (clause)) > + && DECL_LANG_SPECIFIC (OMP_CLAUSE_DECL (clause)) > + && GFC_DECL_SAVED_DESCRIPTOR (OMP_CLAUSE_DECL (clause))) > + decl_type > + = TREE_TYPE (GFC_DECL_SAVED_DESCRIPTOR (OMP_CLAUSE_DECL (clause))); Indentation, decl_type is indented by 4 spaces, but this line by tab (== 8 sp). Otherwise LGTM, sorry for the delay. Jakub