Hi!

As reported in the PR, some diagnostic messages need wording improvements.

Bootstrapped/regtested on x86_64-linux and i686-linux, committed to trunk.

2021-02-28  Jakub Jelinek  <ja...@redhat.com>

        PR fortran/99303
        * openmp.c (gfc_omp_requires_add_clause): Fix up diagnostic message
        wordings.
        (resolve_omp_clauses): Likewise.

--- gcc/fortran/openmp.c.jj     2021-02-18 09:11:25.358114314 +0100
+++ gcc/fortran/openmp.c        2021-02-27 19:37:36.976876441 +0100
@@ -3788,11 +3788,11 @@ gfc_omp_requires_add_clause (gfc_omp_req
       if (clause & OMP_REQ_ATOMIC_MEM_ORDER_MASK)
        gfc_error ("!$OMP REQUIRES clause %<atomic_default_mem_order(%s)%> "
                   "specified via module %qs use at %L but same clause is "
-                  "not set at for the program unit", clause_name, module_name,
-                  loc);
+                  "not specified for the program unit", clause_name,
+                  module_name, loc);
       else
        gfc_error ("!$OMP REQUIRES clause %qs specified via module %qs use at "
-                  "%L but same clause is not set at for the program unit",
+                  "%L but same clause is not specified for the program unit",
                   clause_name, module_name, loc);
       return false;
     }
@@ -5411,7 +5411,7 @@ resolve_omp_clauses (gfc_code *code, gfc
                if (has_inscan && has_notinscan && is_reduction)
                  {
                    gfc_error ("%<inscan%> and non-%<inscan%> %<reduction%> "
-                              "clauses on the same construct %L",
+                              "clauses on the same construct at %L",
                               &n->where);
                    break;
                  }


        Jakub

Reply via email to