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 [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 8C6C83858D28 for ; Fri, 1 Apr 2022 09:07:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8C6C83858D28 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-303-_SNliF4SNgSxNkra0aLveA-1; Fri, 01 Apr 2022 05:07:20 -0400 X-MC-Unique: _SNliF4SNgSxNkra0aLveA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 520D018A658C; Fri, 1 Apr 2022 09:07:20 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.194.220]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0B519C15D56; Fri, 1 Apr 2022 09:07:19 +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 23197Hpt003008 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 1 Apr 2022 11:07:17 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.16.1/8.16.1/Submit) id 23197GT3003007; Fri, 1 Apr 2022 11:07:16 +0200 Date: Fri, 1 Apr 2022 11:07:16 +0200 From: Jakub Jelinek To: Chung-Lin Tang Cc: gcc-patches , Tobias Burnus , Catherine Moore Subject: Re: [PATCH, OpenMP] Fix nested use_device_ptr Message-ID: Reply-To: Jakub Jelinek References: <75e20d43-2f79-b48d-e297-3c75fa3a49b3@codesourcery.com> MIME-Version: 1.0 In-Reply-To: <75e20d43-2f79-b48d-e297-3c75fa3a49b3@codesourcery.com> X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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=-3.7 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_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Fri, 01 Apr 2022 09:07:25 -0000 On Fri, Apr 01, 2022 at 05:02:36PM +0800, Chung-Lin Tang wrote: > this patch fixes a bug in lower_omp_target, where for Fortran arrays, > the expanded sender assignment is wrongly using the variable in the > current ctx, instead of the one looked-up outside, which is causing > use_device_ptr/addr to fail to work when used inside an omp-parallel > (where the omp child_fn is split away from the original). > Just a one-character change to fix this. > > The fix is inside omp-low.cc, though because the omp_array_data langhook > is used only by Fortran, this is essentially Fortran-specific. > > Tested on x86_64-linux + nvptx offloading without regressions. > This is probably not a regression, but seeking to commit when stage1 opens. > > Thanks, > Chung-Lin > > 2022-04-01 Chung-Lin Tang > > gcc/ChangeLog: > > * omp-low.cc (lower_omp_target): Use outer context looked-up 'var' as > argument to lang_hooks.decls.omp_array_data, instead of 'ovar' from > current clause. > > libgomp/ChangeLog: > > * testsuite/libgomp.fortran/use_device_ptr-4.f90: New testcase. Ok, thanks. Jakub