diff options
| author | Tobias Burnus <burnus@net-b.de> | 2014-05-12 21:00:08 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2014-05-12 21:00:08 +0200 |
| commit | da7316cbac19eb2be839e01a5ebf27d97a8e7452 (patch) | |
| tree | acf71282e68f9eb5074392da5115f8ff34ee2933 /gcc | |
| parent | 3842015ea28aa4532399267355400cc2c73b390e (diff) | |
| download | gcc-da7316cbac19eb2be839e01a5ebf27d97a8e7452.zip gcc-da7316cbac19eb2be839e01a5ebf27d97a8e7452.tar.gz gcc-da7316cbac19eb2be839e01a5ebf27d97a8e7452.tar.bz2 | |
re PR fortran/60127 (ICE with OpenMP and DO CONCURRENT)
2014-05-12 Tobias Burnus <burnus@net-b.de>
PR fortran/60127
* openmp.c (resolve_omp_do): Reject do concurrent loops.
2014-05-12 Tobias Burnus <burnus@net-b.de>
PR fortran/60127
* gfortran.dg/gomp/omp_do_concurrent.f90: New.
From-SVN: r210331
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/openmp.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/gomp/omp_do_concurrent.f90 | 13 |
4 files changed, 29 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9f5ba62..606f6df 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2014-05-12 Tobias Burnus <burnus@net-b.de> + + PR fortran/60127 + * openmp.c (resolve_omp_do): Reject do concurrent loops. + 2014-05-12 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/60834 diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 16c7774..a578ad9 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -2169,6 +2169,12 @@ resolve_omp_do (gfc_code *code) "at %L", name, &do_code->loc); break; } + if (do_code->op == EXEC_DO_CONCURRENT) + { + gfc_error ("%s cannot be a DO CONCURRENT loop at %L", name, + &do_code->loc); + break; + } gcc_assert (do_code->op == EXEC_DO); if (do_code->ext.iterator->var->ts.type != BT_INTEGER) gfc_error ("%s iteration variable must be of type integer at %L", diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 667ce8c..a73f1f5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-05-12 Tobias Burnus <burnus@net-b.de> + + PR fortran/60127 + * gfortran.dg/gomp/omp_do_concurrent.f90: New. + 2014-05-12 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/60834 diff --git a/gcc/testsuite/gfortran.dg/gomp/omp_do_concurrent.f90 b/gcc/testsuite/gfortran.dg/gomp/omp_do_concurrent.f90 new file mode 100644 index 0000000..8320479 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/omp_do_concurrent.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } +! { dg-options "-fopenmp" } +! +! PR fortran/60127 +! +! OpenMP 4.0 doesn't permit DO CONCURRENT (yet) +! + +!$omp do +do concurrent(i=1:5) ! { dg-error "OMP DO cannot be a DO CONCURRENT loop" } +print *, 'Hello' +end do +end |