[Fortran,pr70697,v1,Coarray] ICE on EVENT WAIT with array element UNTIL_COUNT argument

Message ID 20170112144338.24f93307@vepi2
State New
Headers show

Commit Message

Andre Vehreschild Jan. 12, 2017, 1:43 p.m.
Hi all,

*** this is no duplicate, but +1 in the PR#! ***

attached patch fixes the ICE by resolving the expression in UNTIL_COUNT
correctly. The ICE was caused by the array-specification in UNTIL_COUNT not
correctly set.

Bootstraps and regtests ok on x86_64-linux/F25. Ok for trunk and gcc-6?

- Andre
-- 
Andre Vehreschild * Email: vehre ad gmx dot de
gcc/testsuite/ChangeLog:

2017-01-12  Andre Vehreschild  <vehre@gcc.gnu.org>

	PR fortran/70697
	* gfortran.dg/coarray/event_4.f08: New test.


gcc/fortran/ChangeLog:

2017-01-12  Andre Vehreschild  <vehre@gcc.gnu.org>

	PR fortran/70697
	* resolve.c (resolve_lock_unlock_event): Resolve the expression for
	event's until_count.

Comments

Jerry DeLisle Jan. 12, 2017, 6:12 p.m. | #1
On 01/12/2017 05:43 AM, Andre Vehreschild wrote:
> Hi all,

> 

> *** this is no duplicate, but +1 in the PR#! ***

> 

> attached patch fixes the ICE by resolving the expression in UNTIL_COUNT

> correctly. The ICE was caused by the array-specification in UNTIL_COUNT not

> correctly set.

> 

> Bootstraps and regtests ok on x86_64-linux/F25. Ok for trunk and gcc-6?

> 

> - Andre

> 


OK and thanks,

Jerry

Patch hide | download patch | download mbox

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);
+    }
 }
 
 
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 0000000..de901c0
--- /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