From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153]) by sourceware.org (Postfix) with ESMTPS id C227C3858D29; Wed, 10 Feb 2021 03:14:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C227C3858D29 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: SM184tcaE2VOwr5fKF2xesDjZLO76tJHc/qbCaX0o7z2RHHMu/7bl/mtmMXJPKJ4Dl1Qf8ZLAI 9rot9V8CRYc7By5EsY1QlYTrGoKcTzbW07bTLR/fakh3SOw+tlwu/OIN49Mz90Civ2ydWDog9Z idsrCkJ6bajMQlzjzmWdWcApXR5JeDFM8Pb5SyPjL4Y5BnUVYWVvmwhfi7E+bpmMvTFZRXTO6t qTeaI/YkMA6AMESRYE8+n3R9fIk37U0/WPVGy87aOHbn/KTQ5hLOw7qhS0lJp8UhbqkvqqtgFB FvY= X-IronPort-AV: E=Sophos;i="5.81,166,1610438400"; d="scan'208";a="60253582" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 09 Feb 2021 19:14:37 -0800 IronPort-SDR: w4SsikbB5bVOdDWck8xytujrWQjNNd0OPZoUpo/5YAXCdg14Dmes3uWwgCkkh/fQVU0t8ihmSx IYw7k54edXRbLCFzf6bBDl8buI9zxJmxCyw/SZfgEcuJ1Fg+iaWbwonLojG+0yj/PMRdSh9mOg z/3qSXakmZyOhR9B5FrDUqoTGquMDKzekRot06cVtP2B5OIH+f6ztOkUanO7eFELIDgUuA8g1m g7MpWqtOn+O9Cp3Tis+CP1Qy9ELgwdEwSEntcx7V4SmCM3iNJEUNZqn4LqoaBd3xIzXYOP7sg7 oZ4= From: Julian Brown To: CC: , Tobias Burnus , Thomas Schwinge , Jakub Jelinek Subject: [PATCH 1/2] Revert "openacc: Allow strided arrays in update directives" Date: Tue, 9 Feb 2021 19:14:06 -0800 Message-ID: <20210210031407.57504-2-julian@codesourcery.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210210031407.57504-1-julian@codesourcery.com> References: <20210210031407.57504-1-julian@codesourcery.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) 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, KAM_SHORT, 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: 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: Wed, 10 Feb 2021 03:14:41 -0000 This patch reverts the non-testsuite parts of commit 9a4d32f85ccebc0ee4b24e6d9d7a4f11c04d7146 which cause ICEs without the yet-to-be-approved patch here: https://gcc.gnu.org/pipermail/gcc-patches/2021-February/564711.html gcc/fortran/ PR fortran/98979 * openmp.c (resolve_omp_clauses): Omit OpenACC update in contiguity check and stride-specified error. --- gcc/fortran/openmp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 797f6c86b62..aab17f0589f 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -5192,8 +5192,7 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses, array isn't contiguous. An expression such as arr(-n:n,-n:n) could be contiguous even if it looks like it may not be. */ - if (code->op != EXEC_OACC_UPDATE - && list != OMP_LIST_CACHE + if (list != OMP_LIST_CACHE && list != OMP_LIST_DEPEND && !gfc_is_simply_contiguous (n->expr, false, true) && gfc_is_not_contiguous (n->expr)) @@ -5231,7 +5230,7 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses, int i; gfc_array_ref *ar = &array_ref->u.ar; for (i = 0; i < ar->dimen; i++) - if (ar->stride[i] && code->op != EXEC_OACC_UPDATE) + if (ar->stride[i]) { gfc_error ("Stride should not be specified for " "array section in %s clause at %L", -- 2.29.2