[gcc/devel/omp/gcc-9] backport: re PR fortran/90002 (ICE: free_expr0(): Bad expr type)

[Tobias Burnus]

https://gcc.gnu.org/g:2c5e6cf9cec1ac6fca5765edcffc5b544826e76b

commit 2c5e6cf9cec1ac6fca5765edcffc5b544826e76b
Author: Steven G. Kargl <kargl@gcc.gnu.org>
Date:   Fri Jun 21 00:38:13 2019 +0000

    backport: re PR fortran/90002 (ICE: free_expr0(): Bad expr type)
    
    2019-06-20  Steven G. Kargl  <kargl@gcc.gnu.org>
    
    	Backport from mainline
    	PR fortran/90002
    	* array.c (gfc_free_array_spec): When freeing an array-spec, avoid
    	an ICE for assumed-shape coarrays
    
    2019-06-20  Steven G. Kargl  <kargl@gcc.gnu.org>
    
    	Backport from mainline
    	PR fortran/90002
    	* gfortran.dg/pr90002.f90: New test.
    
    From-SVN: r272540

Diff:
---
 gcc/fortran/ChangeLog                 |  7 +++++++
 gcc/fortran/array.c                   | 18 +++++++++++++++---
 gcc/testsuite/ChangeLog               |  6 ++++++
 gcc/testsuite/gfortran.dg/pr90002.f90 |  6 ++++++
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index c5a8663..8fad5e8 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,6 +1,13 @@
 2019-06-20  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	Backport from mainline
+	PR fortran/90002
+	* array.c (gfc_free_array_spec): When freeing an array-spec, avoid
+	an ICE for assumed-shape coarrays 
+
+2019-06-20  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	Backport from mainline
 	PR fortran/89344
 	* expr.c (gfc_check_vardef_context): Check for INTENT(IN) variable
 	in SELECT TYPE construct.
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 96732ecd..0aee220 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -324,10 +324,22 @@ gfc_free_array_spec (gfc_array_spec *as)
   if (as == NULL)
     return;
 
-  for (i = 0; i < as->rank + as->corank; i++)
+  if (as->corank == 0)
     {
-      gfc_free_expr (as->lower[i]);
-      gfc_free_expr (as->upper[i]);
+      for (i = 0; i < as->rank; i++)
+	{
+	  gfc_free_expr (as->lower[i]);
+	  gfc_free_expr (as->upper[i]);
+	}
+    }
+  else
+    {
+      int n = as->rank + as->corank - (as->cotype == AS_EXPLICIT ? 1 : 0);
+      for (i = 0; i < n; i++)
+	{
+	  gfc_free_expr (as->lower[i]);
+	  gfc_free_expr (as->upper[i]);
+	}
     }
 
   free (as);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f5466c0..fd0afe0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,12 @@
 2019-06-20  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	Backport from mainline
+	PR fortran/90002
+	* gfortran.dg/pr90002.f90: New test.
+
+2019-06-20  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	Backport from mainline
 	PR fortran/89344
 	* gfortran.dg/pr89344.f90: New test.
 
diff --git a/gcc/testsuite/gfortran.dg/pr90002.f90 b/gcc/testsuite/gfortran.dg/pr90002.f90
new file mode 100644
index 0000000..cb993a5
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr90002.f90
@@ -0,0 +1,6 @@
+! { dg-do compile }
+! { dg-options "-fcoarray=single" }
+! Contributed by Arseny Solokha <asolokha at gmx dot de>
+module pc
+  integer, dimension(1) :: zw[1:1,1:*]
+end module pc