diff options
| author | vehre <vehre@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-01-13 10:39:52 +0000 |
|---|---|---|
| committer | vehre <vehre@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-01-13 10:39:52 +0000 |
| commit | c957c4120c31e7ed534c18270dda2958023abf5c (patch) | |
| tree | 5e3e02429a05e3e3aa17d66824a6d5b9fcfacb8a /gcc/fortran/resolve.c | |
| parent | 12e7feb99fe468f6609350f230fe938b816f0e95 (diff) | |
gcc/testsuite/ChangeLog:
2017-01-13 Andre Vehreschild <vehre@gcc.gnu.org>
PR fortran/70697
* gfortran.dg/coarray/event_4.f08: New test.
gcc/fortran/ChangeLog:
2017-01-13 Andre Vehreschild <vehre@gcc.gnu.org>
PR fortran/70697
* resolve.c (resolve_lock_unlock_event): Resolve the expression for
event's until_count.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244413 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index a75d5feb8f6..a5fe2314372 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -9158,10 +9158,13 @@ resolve_lock_unlock_event (gfc_code *code) return; /* Check for EVENT WAIT the UNTIL_COUNT. */ - if (code->op == EXEC_EVENT_WAIT && code->expr4 - && (code->expr4->ts.type != BT_INTEGER || code->expr4->rank != 0)) - gfc_error ("UNTIL_COUNT= argument at %L must be a scalar INTEGER " - "expression", &code->expr4->where); + if (code->op == EXEC_EVENT_WAIT && code->expr4) + { + if (!gfc_resolve_expr (code->expr4) || code->expr4->ts.type != BT_INTEGER + || code->expr4->rank != 0) + gfc_error ("UNTIL_COUNT= argument at %L must be a scalar INTEGER " + "expression", &code->expr4->where); + } } |