aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Anlauf <anlauf@gmx.de>2022-07-20 20:40:23 +0200
committerHarald Anlauf <anlauf@gmx.de>2022-07-20 20:40:23 +0200
commit26bbe78f77f73bb66af1ac13d0deec888a3c6510 (patch)
tree3f76e1766f5a612d1fcc19397cc86fa96f94fc8f
parentdaa36cfc2fc2538810db071b81d250f4d621f7ea (diff)
downloadgcc-26bbe78f77f73bb66af1ac13d0deec888a3c6510.zip
gcc-26bbe78f77f73bb66af1ac13d0deec888a3c6510.tar.gz
gcc-26bbe78f77f73bb66af1ac13d0deec888a3c6510.tar.bz2
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.
-rw-r--r--gcc/fortran/openmp.cc1
-rw-r--r--gcc/testsuite/gfortran.dg/gomp/affinity-clause-7.f9019
2 files changed, 19 insertions, 1 deletions
diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc
index bd4ff25..df9cdf4 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 0000000..5b1ca85
--- /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