diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2022-07-20 20:40:23 +0200 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gmx.de> | 2022-07-20 20:52:52 +0200 |
| commit | 16155316ea663d854e3ab72b49f1fe1bfacd5e18 (patch) | |
| tree | 7dbfd0ae3446768cb0d39bc18a9ed6b46c6af638 | |
| parent | 94d44a83ff90a96237b0a40e6b2048d02fbff192 (diff) | |
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.
(cherry picked from commit 26bbe78f77f73bb66af1ac13d0deec888a3c6510)
| -rw-r--r-- | gcc/fortran/openmp.cc | 1 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/gomp/affinity-clause-7.f90 | 19 |
2 files changed, 19 insertions, 1 deletions
diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc index 714148138c2..5018a37ec46 100644 --- a/gcc/fortran/openmp.cc +++ b/gcc/fortran/openmp.cc @@ -1142,7 +1142,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 |