public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-1767] Fortran: fix parsing of omp task affinity iterator clause [PR101330]
@ 2022-07-20 18:40 Harald Anlauf
0 siblings, 0 replies; only message in thread
From: Harald Anlauf @ 2022-07-20 18:40 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:26bbe78f77f73bb66af1ac13d0deec888a3c6510
commit r13-1767-g26bbe78f77f73bb66af1ac13d0deec888a3c6510
Author: Harald Anlauf <anlauf@gmx.de>
Date: Wed Jul 20 20:40:23 2022 +0200
Fortran: fix parsing of omp task affinity iterator clause [PR101330]
gcc/fortran/ChangeLog:
PR fortran/101330
* openmp.cc (gfc_match_iterator): Remove left-over code from
development that could lead to a crash on invalid input.
gcc/testsuite/ChangeLog:
PR fortran/101330
* gfortran.dg/gomp/affinity-clause-7.f90: New test.
Diff:
---
gcc/fortran/openmp.cc | 1 -
gcc/testsuite/gfortran.dg/gomp/affinity-clause-7.f90 | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc
index bd4ff259fe0..df9cdf43eb7 100644
--- a/gcc/fortran/openmp.cc
+++ b/gcc/fortran/openmp.cc
@@ -1181,7 +1181,6 @@ gfc_match_iterator (gfc_namespace **ns, bool permit_var)
}
if (':' == gfc_peek_ascii_char ())
{
- step = gfc_get_expr ();
if (gfc_match (": %e ", &step) != MATCH_YES)
{
gfc_free_expr (begin);
diff --git a/gcc/testsuite/gfortran.dg/gomp/affinity-clause-7.f90 b/gcc/testsuite/gfortran.dg/gomp/affinity-clause-7.f90
new file mode 100644
index 00000000000..5b1ca85aba3
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/affinity-clause-7.f90
@@ -0,0 +1,19 @@
+! { dg-do compile }
+! PR fortran/101330 - ICE in free_expr0(): Bad expr type
+! Contributed by G.Steinmetz
+
+ implicit none
+ integer :: j, b(10)
+!$omp task affinity (iterator(j=1:2:1) : b(j))
+!$omp end task
+!$omp task affinity (iterator(j=1:2:) : b(j)) ! { dg-error "Invalid character" }
+!!$omp end task
+!$omp task affinity (iterator(j=1:2: ! { dg-error "Invalid character" }
+!!$omp end task
+!$omp task affinity (iterator(j=1:2:) ! { dg-error "Invalid character" }
+!!$omp end task
+!$omp task affinity (iterator(j=1:2::) ! { dg-error "Invalid character" }
+!!$omp end task
+!$omp task affinity (iterator(j=1:2:)) ! { dg-error "Invalid character" }
+!!$omp end task
+end
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-07-20 18:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-20 18:40 [gcc r13-1767] Fortran: fix parsing of omp task affinity iterator clause [PR101330] Harald Anlauf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).