public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Tobias Burnus <burnus@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc/devel/omp/gcc-12] Fix Fortran/openmp: Partial OpenMP 5.2 doacross
Date: Wed,  7 Sep 2022 11:02:01 +0000 (GMT)	[thread overview]
Message-ID: <20220907110201.38080385117A@sourceware.org> (raw)

https://gcc.gnu.org/g:e085944818e4c119642967b60578e492a7de1039

commit e085944818e4c119642967b60578e492a7de1039
Author: Tobias Burnus <tobias@codesourcery.com>
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  <tobias@codesourcery.com>
+
+	Backport from mainline:
+	2022-09-06  Tobias Burnus  <tobias@codesourcery.com>
+
+	* openmp.cc (resolve_omp_clauses): Remove ordered/linear
+	check as it is handled now in the middle end.
+
 2022-09-05  Tobias Burnus  <tobias@codesourcery.com>
 
 	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 "

                 reply	other threads:[~2022-09-07 11:02 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220907110201.38080385117A@sourceware.org \
    --to=burnus@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).