diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/openmp.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/goacc/wait.f90 | 12 |
4 files changed, 22 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b6abf24..4dac286 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2017-09-21 Cesar Philippidis <cesar@codesourcery.com> + + * openmp.c (gfc_match_oacc_wait): Don't restrict wait directive + arguments to constant integers. + 2017-09-17 Paul Thomas <pault@gcc.gnu.org> PR fortran/82173 diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 8400354..c5e0088 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -2185,8 +2185,7 @@ gfc_match_oacc_wait (void) } if (!gfc_resolve_expr (el->expr) - || el->expr->ts.type != BT_INTEGER || el->expr->rank != 0 - || el->expr->expr_type != EXPR_CONSTANT) + || el->expr->ts.type != BT_INTEGER || el->expr->rank != 0) { gfc_error ("WAIT clause at %L requires a scalar INTEGER expression", &el->expr->where); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1c241b9..1ea22ee 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2017-09-21 Cesar Philippidis <cesar@codesourcery.com> + + * gfortran.dg/goacc/wait.f90: New test. + 2017-09-21 Jakub Jelinek <jakub@redhat.com> PR sanitizer/81715 diff --git a/gcc/testsuite/gfortran.dg/goacc/wait.f90 b/gcc/testsuite/gfortran.dg/goacc/wait.f90 new file mode 100644 index 0000000..9cdbcdf --- /dev/null +++ b/gcc/testsuite/gfortran.dg/goacc/wait.f90 @@ -0,0 +1,12 @@ +! Ensure that ACC WAIT accept integer arguments. + +subroutine foo (wqueue) + implicit none + integer :: wqueue, waitno + integer, parameter :: waitp = 100 + + !$acc wait (wqueue) + !$acc wait (waitno) + !$acc wait (waitp) + !$acc wait (0) +end subroutine foo |