From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 92AD23AA88FB; Fri, 27 May 2022 12:38:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 92AD23AA88FB MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-800] Fortran: Fix OpenMP clause name in error message X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/master X-Git-Oldrev: 37c988bc1b22d1259a4d8e819fc33c65faa9debb X-Git-Newrev: 8af266501795dd76d05faef498dbd3472a01b305 Message-Id: <20220527123826.92AD23AA88FB@sourceware.org> Date: Fri, 27 May 2022 12:38:26 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2022 12:38:26 -0000 https://gcc.gnu.org/g:8af266501795dd76d05faef498dbd3472a01b305 commit r13-800-g8af266501795dd76d05faef498dbd3472a01b305 Author: Tobias Burnus Date: Fri May 27 13:12:45 2022 +0200 Fortran: Fix OpenMP clause name in error message gcc/fortran/ChangeLog: * openmp.cc (gfc_check_omp_requires): Fix clause name in error. gcc/testsuite/ChangeLog: * gfortran.dg/gomp/requires-4.f90: Update dg-error. * gfortran.dg/gomp/requires-8.f90: Update dg-error. Co-authored-by: Chung-Lin Tang Diff: --- gcc/fortran/openmp.cc | 2 +- gcc/testsuite/gfortran.dg/gomp/requires-4.f90 | 2 +- gcc/testsuite/gfortran.dg/gomp/requires-8.f90 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc index 6172ec27687..efa62b64f2b 100644 --- a/gcc/fortran/openmp.cc +++ b/gcc/fortran/openmp.cc @@ -5272,7 +5272,7 @@ gfc_check_omp_requires (gfc_namespace *ns, int ref_omp_requires) if ((ref_omp_requires & OMP_REQ_REVERSE_OFFLOAD) && !(ns->omp_requires & OMP_REQ_REVERSE_OFFLOAD)) gfc_error ("Program unit at %L has OpenMP device constructs/routines " - "but does not set !$OMP REQUIRES REVERSE_OFFSET but other " + "but does not set !$OMP REQUIRES REVERSE_OFFLOAD but other " "program units do", &ns->proc_name->declared_at); if ((ref_omp_requires & OMP_REQ_UNIFIED_ADDRESS) && !(ns->omp_requires & OMP_REQ_UNIFIED_ADDRESS)) diff --git a/gcc/testsuite/gfortran.dg/gomp/requires-4.f90 b/gcc/testsuite/gfortran.dg/gomp/requires-4.f90 index b17aceb898b..c870a2840d3 100644 --- a/gcc/testsuite/gfortran.dg/gomp/requires-4.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/requires-4.f90 @@ -9,7 +9,7 @@ end module m subroutine foo !$omp target !$omp end target -! { dg-error "OpenMP device constructs/routines but does not set !.OMP REQUIRES REVERSE_OFFSET but other program units do" "" { target *-*-* } 9 } +! { dg-error "OpenMP device constructs/routines but does not set !.OMP REQUIRES REVERSE_OFFLOAD but other program units do" "" { target *-*-* } 9 } ! { dg-error "OpenMP device constructs/routines but does not set !.OMP REQUIRES UNIFIED_ADDRESS but other program units do" "" { target *-*-* } 9 } ! { dg-error "OpenMP device constructs/routines but does not set !.OMP REQUIRES UNIFIED_SHARED_MEMORY but other program units do" "" { target *-*-* } 9 } end diff --git a/gcc/testsuite/gfortran.dg/gomp/requires-8.f90 b/gcc/testsuite/gfortran.dg/gomp/requires-8.f90 index eadfcaf8609..e84d609ad29 100644 --- a/gcc/testsuite/gfortran.dg/gomp/requires-8.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/requires-8.f90 @@ -13,7 +13,7 @@ contains end subroutine foo end module m -subroutine bar ! { dg-error "has OpenMP device constructs/routines but does not set !.OMP REQUIRES REVERSE_OFFSET but other program units do" } +subroutine bar ! { dg-error "has OpenMP device constructs/routines but does not set !.OMP REQUIRES REVERSE_OFFLOAD but other program units do" } !use m !$omp requires unified_shared_memory !$omp declare target