From: Harald Anlauf <anlauf@gmx.de>
Date: Mon, 20 Jan 2025 20:21:48 +0000 (+0100)
Subject: Fortran: improve error message for conflicting OpenMP clauses [PR107122]
X-Git-Tag: basepoints/gcc-16~2476
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96f4ba4d19a765902af7b79aa77d52c62fa2f82c;p=thirdparty%2Fgcc.git

Fortran: improve error message for conflicting OpenMP clauses [PR107122]

	PR fortran/107122

gcc/fortran/ChangeLog:

	* openmp.cc (resolve_omp_clauses): Add 'with' to error message text.

gcc/testsuite/ChangeLog:

	* gfortran.dg/gomp/order-8.f90: Adjust pattern.
---

diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc
index e51ff1f4d29..be78aa1ab27 100644
--- a/gcc/fortran/openmp.cc
+++ b/gcc/fortran/openmp.cc
@@ -8171,7 +8171,7 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses,
     gfc_error ("ORDERED clause parameter is less than COLLAPSE at %L",
 	       &code->loc);
   if (omp_clauses->order_concurrent && omp_clauses->ordered)
-    gfc_error ("ORDER clause must not be used together ORDERED at %L",
+    gfc_error ("ORDER clause must not be used together with ORDERED at %L",
 	       &code->loc);
   if (omp_clauses->if_expr)
     {
diff --git a/gcc/testsuite/gfortran.dg/gomp/order-8.f90 b/gcc/testsuite/gfortran.dg/gomp/order-8.f90
index c753886d621..80b4b722be0 100644
--- a/gcc/testsuite/gfortran.dg/gomp/order-8.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/order-8.f90
@@ -36,24 +36,24 @@ subroutine f2 (a)
   do i = 1, 128
     a(i) = a(i) + 1
   end do
-  !$omp do order(concurrent) ordered	! { dg-error "ORDER clause must not be used together ORDERED" }
+  !$omp do order(concurrent) ordered	! { dg-error "ORDER clause must not be used together with ORDERED" }
   do i = 1, 128
       !$omp ordered
       a(i) = a(i) + 1
       !$omp end ordered
   end do
-  !$omp do ordered order(concurrent)	! { dg-error "ORDER clause must not be used together ORDERED" }
+  !$omp do ordered order(concurrent)	! { dg-error "ORDER clause must not be used together with ORDERED" }
   do i = 1, 128
       !$omp ordered
       a(i) = a(i) + 1
       !$omp end ordered
   end do
-  !$omp do ordered (1) order(concurrent)	! { dg-error "ORDER clause must not be used together ORDERED" }
+  !$omp do ordered (1) order(concurrent)	! { dg-error "ORDER clause must not be used together with ORDERED" }
   do i = 1, 128
       !$omp ordered depend (sink: i - 1)
       !$omp ordered depend (source)
   end do
-  !$omp do order(concurrent)ordered (1)	! { dg-error "ORDER clause must not be used together ORDERED" }
+  !$omp do order(concurrent)ordered (1)	! { dg-error "ORDER clause must not be used together with ORDERED" }
   do i = 1, 128
       !$omp ordered depend (sink: i - 1)
       !$omp ordered depend (source)