From eaed322611b9c09a746f84e6280cdd400aaf9d60 Mon Sep 17 00:00:00 2001 From: Andre Vehreschild Date: Fri, 13 Jan 2017 11:39:52 +0100 Subject: re PR fortran/70697 ([Coarray] ICE on EVENT WAIT with array element UNTIL_COUNT argument) gcc/testsuite/ChangeLog: 2017-01-13 Andre Vehreschild PR fortran/70697 * gfortran.dg/coarray/event_4.f08: New test. gcc/fortran/ChangeLog: 2017-01-13 Andre Vehreschild PR fortran/70697 * resolve.c (resolve_lock_unlock_event): Resolve the expression for event's until_count. From-SVN: r244413 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/resolve.c | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index e979a30..191bfc8 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2017-01-13 Andre Vehreschild + PR fortran/70697 + * resolve.c (resolve_lock_unlock_event): Resolve the expression for + event's until_count. + +2017-01-13 Andre Vehreschild + PR fortran/70696 * trans-expr.c (gfc_get_tree_for_caf_expr): Ensure the backend_decl is valid before accessing it. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index a75d5fe..a5fe231 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); + } } -- cgit v1.1