diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2025-01-20 21:21:48 +0100 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gmx.de> | 2025-01-20 21:21:48 +0100 |
| commit | 96f4ba4d19a765902af7b79aa77d52c62fa2f82c (patch) | |
| tree | f9e2eb40d2e43b190b381fcdb255357ece1ca491 | |
| parent | 749dcd9ba8466fec5b51dd564cd63424c44f808b (diff) | |
| download | gcc-96f4ba4d19a765902af7b79aa77d52c62fa2f82c.zip gcc-96f4ba4d19a765902af7b79aa77d52c62fa2f82c.tar.gz gcc-96f4ba4d19a765902af7b79aa77d52c62fa2f82c.tar.bz2 | |
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.
| -rw-r--r-- | gcc/fortran/openmp.cc | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/gomp/order-8.f90 | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc index e51ff1f..be78aa1 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 c753886..80b4b72 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) |