From patchwork Fri May 14 21:27:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Brown X-Patchwork-Id: 1478703 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (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 ozlabs.org (Postfix) with ESMTPS id 4FhhT50PVTz9sWQ for ; Sat, 15 May 2021 07:27:53 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DA850394C01A; Fri, 14 May 2021 21:27:50 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id AD69D393FC2F; Fri, 14 May 2021 21:27:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AD69D393FC2F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Julian_Brown@mentor.com IronPort-SDR: DHGI+5+Tv40Y2K4uuCYPp4eUXtbbMqfw4lyUd0pXxTaO7xFya+sutyL6OPf0nWYtvY8ck5p7of xSFcTZilLZsYfPhJL12sVXvoPFPlF/EhFFo2UqPU23AYtRVbAMiqyMrHU/SDtdgTbf8YOE2SEh sKZNEnlZTjRzq/oLhlm9o7GnI9oSX1MaH5bzb1QvZ/IuqVJUIBK8byUIzXRSTKP/JW64CL5zcc LgpYxsAWwl261ReLmlRM1CoRmrvvL2QLpple9P/LAZmTOvEw/o+/9FEODLktscYq5tsyA/7bvS 2kQ= X-IronPort-AV: E=Sophos;i="5.82,300,1613462400"; d="scan'208";a="61370302" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 14 May 2021 13:27:47 -0800 IronPort-SDR: 9+hsd8JinmOHrFdInPgIcsG1+tJTVtm199vgZvuqAz635BxJ1eZvapCDkj95AoE5kiUbrG2YSm 9MPesKHRX8MxJCMy32F+dJBKBIoDSOIC6q3poLsSxn3Kp3QhYM7RRfZ/ZrvfszG4dzdvEokhVb K3PGjO1yICdROJuI4Eun7dX7dO3eFVXXvMkPsSmCdD14Z9oGHQZPUwF/NpUCVvDMTV2bcbjeT1 rOmLsnj8Clv9VnufSb3EqaNcVFwsmXWfHVRsVMUAtQ39HvWvElI/NcUIa1REPvuk9tlKOdpNwB F8I= From: Julian Brown To: Subject: [PATCH 5/5] Mapping of components of references to pointers to structs for OpenMP/OpenACC Date: Fri, 14 May 2021 14:27:38 -0700 Message-ID: <5b175bd107bcacf3946ac63f043406bfdd80d8f3.1621026372.git.julian@codesourcery.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-05.mgc.mentorg.com (139.181.222.5) To SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, 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: 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: , Cc: Jakub Jelinek , Tobias Burnus , Thomas Schwinge , fortran@gcc.gnu.org Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" GCC currently raises a parse error for indirect accesses to struct members, where the base of the access is a reference to a pointer. This patch fixes that case. OK for trunk? Thanks, Julian 2021-05-14 Julian Brown gcc/cp/ * semantics.c (finish_omp_clauses): Handle components of references to pointers to structs. libgomp/ * testsuite/libgomp.oacc-c++/deep-copy-17.C: Update test. --- gcc/cp/semantics.c | 7 ++++++- libgomp/testsuite/libgomp.oacc-c++/deep-copy-17.C | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 0d590c318fb..b09023f741c 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -7670,7 +7670,12 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort) if ((ort == C_ORT_ACC || ort == C_ORT_OMP) && TREE_CODE (t) == COMPONENT_REF && TREE_CODE (TREE_OPERAND (t, 0)) == INDIRECT_REF) - t = TREE_OPERAND (TREE_OPERAND (t, 0), 0); + { + t = TREE_OPERAND (TREE_OPERAND (t, 0), 0); + /* References to pointers have a double indirection here. */ + if (TREE_CODE (t) == INDIRECT_REF) + t = TREE_OPERAND (t, 0); + } if (TREE_CODE (t) == COMPONENT_REF && ((ort & C_ORT_OMP_DECLARE_SIMD) == C_ORT_OMP || ort == C_ORT_ACC) diff --git a/libgomp/testsuite/libgomp.oacc-c++/deep-copy-17.C b/libgomp/testsuite/libgomp.oacc-c++/deep-copy-17.C index dacbb520f3d..e038e9e3802 100644 --- a/libgomp/testsuite/libgomp.oacc-c++/deep-copy-17.C +++ b/libgomp/testsuite/libgomp.oacc-c++/deep-copy-17.C @@ -83,7 +83,7 @@ void strrp (void) a[0] = 8; c[0] = 10; e[0] = 12; - #pragma acc parallel copy(n->a[0:10], n->c[0:10], n->e[0:10]) + #pragma acc parallel copy(n->a[0:10], n->b, n->c[0:10], n->d, n->e[0:10]) { n->a[0] = n->c[0] + n->e[0]; }