From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 38080385117A; Wed, 7 Sep 2022 11:02:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 38080385117A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662548521; bh=tpDPll6hlWQ4C7wVCIpg0jNq6XzlwXUhmKGikrsrX3E=; h=From:To:Subject:Date:From; b=yIMMbPFWwKQh2dh0fljJLff36f9yL9WvAPXZW8TWIzN4fHvJ1JPkNwlpunxiupsZq c9mfHiF2i8jHKh725mMfrJxsivouPwS1W4rbszQYuZwmp1cFemakpX1HGkuMOvMq+m FPmcoCxO53LiYFXkqJCnNUCxbmLIs/gCzd7a3p5g= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] Fix Fortran/openmp: Partial OpenMP 5.2 doacross X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 943cc3e7ed020a2a841419bba1516cf47c7e2e81 X-Git-Newrev: e085944818e4c119642967b60578e492a7de1039 Message-Id: <20220907110201.38080385117A@sourceware.org> Date: Wed, 7 Sep 2022 11:02:01 +0000 (GMT) List-Id: https://gcc.gnu.org/g:e085944818e4c119642967b60578e492a7de1039 commit e085944818e4c119642967b60578e492a7de1039 Author: Tobias Burnus Date: Tue Sep 6 10:21:04 2022 +0200 Fix Fortran/openmp: Partial OpenMP 5.2 doacross This removed a checking snippet which accidentally was left in in commit r13-2446-g938cda536019cd6a1bc0dd2346381185b420bbf8 ; this caused fails in gfortran.dg/gomp/doacross-5.f90 (added in that very commit). Note that a similar but refined check is now done in the middle end. (The ME version additionally checks whether doacross is present.) gcc/fortran/ * openmp.cc (resolve_omp_clauses): Remove ordered/linear check as it is handled now in the middle end. (cherry picked from commit d6582c662ca0da05c74fa3183e1bc2cadcb21424) Diff: --- gcc/fortran/ChangeLog.omp | 8 ++++++++ gcc/fortran/openmp.cc | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp index 6ca5ae8eac5..6d0a243169b 100644 --- a/gcc/fortran/ChangeLog.omp +++ b/gcc/fortran/ChangeLog.omp @@ -1,3 +1,11 @@ +2022-09-06 Tobias Burnus + + Backport from mainline: + 2022-09-06 Tobias Burnus + + * openmp.cc (resolve_omp_clauses): Remove ordered/linear + check as it is handled now in the middle end. + 2022-09-05 Tobias Burnus Backport from mainline: diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc index de4a3c3a6e2..054a4415db6 100644 --- a/gcc/fortran/openmp.cc +++ b/gcc/fortran/openmp.cc @@ -8408,10 +8408,6 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses, linear_op = n->u.linear.op; } } - else if (omp_clauses->orderedc) - gfc_error ("LINEAR clause specified together with " - "ORDERED clause with argument at %L", - &n->where); else if (n->u.linear.op != OMP_LINEAR_REF && n->sym->ts.type != BT_INTEGER) gfc_error ("LINEAR variable %qs must be INTEGER "