[gcc r13-2196] Fortran/OpenMP: Fix strictly structured blocks parsing
Tobias Burnus
burnus@gcc.gnu.org
Thu Aug 25 06:35:14 GMT 2022
https://gcc.gnu.org/g:33f24eb58748e9db7c827662753757c5c2217eb4
commit r13-2196-g33f24eb58748e9db7c827662753757c5c2217eb4
Author: Tobias Burnus <tobias@codesourcery.com>
Date: Thu Aug 25 08:34:03 2022 +0200
Fortran/OpenMP: Fix strictly structured blocks parsing
gcc/fortran/ChangeLog:
* parse.cc (parse_omp_structured_block): When parsing strictly
structured blocks, issue an error if the end-directive comes
before the 'end block'.
gcc/testsuite/ChangeLog:
* gfortran.dg/gomp/strictly-structured-block-4.f90: New test.
Diff:
---
gcc/fortran/parse.cc | 2 +-
.../gomp/strictly-structured-block-4.f90 | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/gcc/fortran/parse.cc b/gcc/fortran/parse.cc
index 0b4c596996c..80492c952aa 100644
--- a/gcc/fortran/parse.cc
+++ b/gcc/fortran/parse.cc
@@ -5709,7 +5709,7 @@ parse_omp_structured_block (gfc_statement omp_st, bool workshare_stmts_only)
}
return st;
}
- else if (st != omp_end_st)
+ else if (st != omp_end_st || block_construct)
{
unexpected_statement (st);
st = next_statement ();
diff --git a/gcc/testsuite/gfortran.dg/gomp/strictly-structured-block-4.f90 b/gcc/testsuite/gfortran.dg/gomp/strictly-structured-block-4.f90
new file mode 100644
index 00000000000..66cf0a3925e
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/strictly-structured-block-4.f90
@@ -0,0 +1,21 @@
+! { dg-do compile }
+implicit none
+integer ::x,z
+x = 42
+print '(*(z16:" "))', loc(x)
+!$omp target map(x, z)
+block
+ integer :: y
+ x = 123
+ y = 99
+ !$omp target device(ancestor:1) map(always,tofrom:x) map(y) ! { dg-error "'ancestor' device modifier not preceded by 'requires' directive with 'reverse_offload' clause" }
+ print '(*(z16:" "))', loc(x), loc(y)
+ print * ,x, y
+ x = -x
+ y = -y
+ !$omp end target ! { dg-error "Unexpected ..OMP END TARGET statement" }
+ z = y
+end block
+ print * ,x !, z
+end
+
More information about the Gcc-cvs
mailing list