From ae091a44f6a477fbcf463e80fd604540cad3b37f Mon Sep 17 00:00:00 2001
From: Tobias Burnus <tobias@codesourcery.com>
Date: Thu, 9 Feb 2023 10:58:00 +0100
Subject: [PATCH] Fortran/OpenMP: Fix -fopenmp-simd for 'omp assume(s)'
While 'omp assume' is enabled by -fopenmp-simd, 'omp assumes' is not;
however, due to the way parsing works in Fortran (esp. for fixed-form
source code), 'assumes' was parsed by 'assume' which then stumbled over
the tailing 's'.
gcc/fortran/
* parse.cc (decode_omp_directive): Really ignore 'assumes' with
-fopenmp-simd.
gcc/testsuite/
* gfortran.dg/gomp/openmp-simd-8.f90: New test.
---
gcc/fortran/parse.cc | 3 +++
.../gfortran.dg/gomp/openmp-simd-8.f90 | 25 +++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 gcc/testsuite/gfortran.dg/gomp/openmp-simd-8.f90
diff --git a/gcc/fortran/parse.cc b/gcc/fortran/parse.cc
index 039e7e7da531..f5154d97ae85 100644
--- a/gcc/fortran/parse.cc
+++ b/gcc/fortran/parse.cc
@@ -885,6 +885,9 @@ decode_omp_directive (void)
switch (c)
{
case 'a':
+ /* For -fopenmp-simd, ignore 'assumes'; note no clause starts with 's'. */
+ if (!flag_openmp && gfc_match ("assumes") == MATCH_YES)
+ break;
matcho ("assumes", gfc_match_omp_assumes, ST_OMP_ASSUMES);
matchs ("assume", gfc_match_omp_assume, ST_OMP_ASSUME);
matcho ("atomic", gfc_match_omp_atomic, ST_OMP_ATOMIC);
diff --git a/gcc/testsuite/gfortran.dg/gomp/openmp-simd-8.f90 b/gcc/testsuite/gfortran.dg/gomp/openmp-simd-8.f90
new file mode 100644
index 000000000000..cf92abf2f9e0
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/openmp-simd-8.f90
@@ -0,0 +1,25 @@
+! { dg-options "-fno-openmp -fopenmp-simd -fdump-tree-original" }
+
+! While 'omp assumes' is ignored with -fopenmp-simd,
+! 'omp assume' is processed - check that this works.
+
+module m
+ !$omp assumes no_openmp invalid_clause ! Should get ignored
+contains
+ integer function foo()
+ foo = 5
+ end function
+end
+
+program main
+ use m
+ implicit none
+ !$omp assumes no_openmp ! likewise ignored
+ integer :: n
+ !$omp assume holds (foo() > 0) ! should be honoured
+ n = foo()
+ if (n == 0) stop
+ !$omp end assume
+end
+
+! { dg-final { scan-tree-dump "\\.ASSUME \\(foo \\(\\) > 0\\);" "original" } }
--
GitLab