From eaed322611b9c09a746f84e6280cdd400aaf9d60 Mon Sep 17 00:00:00 2001
From: Andre Vehreschild <vehre@gcc.gnu.org>
Date: Fri, 13 Jan 2017 11:39:52 +0100
Subject: [PATCH] re PR fortran/70697 ([Coarray] ICE on EVENT WAIT with array
element UNTIL_COUNT argument)
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.
From-SVN: r244413
---
gcc/fortran/ChangeLog | 6 ++++++
gcc/fortran/resolve.c | 11 +++++++----
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/gfortran.dg/coarray/event_4.f08 | 12 ++++++++++++
4 files changed, 30 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/gfortran.dg/coarray/event_4.f08
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e979a3082392..191bfc816a71 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
2017-01-13 Andre Vehreschild <vehre@gcc.gnu.org>
PR fortran/70696
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index a75d5feb8f60..a5fe2314372c 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);
+ }
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index df14a1bc3350..3a6fcfc2356c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-13 Andre Vehreschild <vehre@gcc.gnu.org>
+
+ PR fortran/70697
+ * gfortran.dg/coarray/event_4.f08: New test.
+
2017-01-13 Andre Vehreschild <vehre@gcc.gnu.org>
PR fortran/70696
diff --git a/gcc/testsuite/gfortran.dg/coarray/event_4.f08 b/gcc/testsuite/gfortran.dg/coarray/event_4.f08
new file mode 100644
index 000000000000..de901c01aa43
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/coarray/event_4.f08
@@ -0,0 +1,12 @@
+! { dg-do run }
+!
+! Check that pr 70697 is fixed.
+
+program event_4
+ use iso_fortran_env
+ integer :: nc(1)
+ type(event_type) done[*]
+ nc(1) = 1
+ event post(done[1])
+ event wait(done,until_count=nc(1))
+end