backport: re PR fortran/80118 (ICE with zero size parameter array)

2017-10-06  Thomas Koenig  <tkoenig@gcc.gnu.org>
            Steven G. Kargl  <kargl@gcc.gnu.org>

        Backport from trunk
        PR fortran/80118
        * expr.c (gfc_get_full_arrayspec_from_expr): If there is
        no symtree, set array spec to NULL.

2017-10-06  Thomas Koenig  <tkoenig@gcc.gnu.org>
            Steven G. Kargl  <kargl@gcc.gnu.org>

        Backport from trunk
        PR fortran/80118
        * gfortran.dg/zero_sized_7.f90: New test.

Co-Authored-By: Steven G. Kargl <kargl@gcc.gnu.org>
From-SVN: r253500

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 0d1f7b66ae293da33064cbd66462645dde3be4c7..ac16bc09fc121742d7dd57d467c4c6f270b03405 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-06  Thomas Koenig <tkoenig@gcc.gnu.org>
+           Steven G. Kargl <kargl@gcc.gnu.org>
+
+       Backport from trunk
+       * expr.c (gfc_get_full_arrayspec_from_expr): If there is
+       no symtree, set array spec to NULL.
+
 2017-09-02  Janus Weil  <janus@gcc.gnu.org>
 
        Backport from trunk

diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index b91f906e86ccfecfc007e29e4a49c501ca3a83d0..a30ea2d3d54f54dbfe79b46c7d2a6cd41783b94a 100644 (file)
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -4102,7 +4102,11 @@ gfc_get_full_arrayspec_from_expr (gfc_expr *expr)
   if (expr->expr_type == EXPR_VARIABLE
       || expr->expr_type == EXPR_CONSTANT)
     {
-      as = expr->symtree->n.sym->as;
+      if (expr->symtree)
+       as = expr->symtree->n.sym->as;
+      else
+       as = NULL;
+
       for (ref = expr->ref; ref; ref = ref->next)
        {
          switch (ref->type)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bbeea292d7dcbcc12375abc43c1ebe6d0d1ba2ae..c53d6b168f8378ebbbdcad9241e7d8d7462a517e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-06  Thomas Koenig  <tkoenig@gcc.gnu.org>
+            Steven G. Kargl  <kargl@gcc.gnu.org>
+
+        Backport from trunk
+        PR fortran/80118
+        * gfortran.dg/zero_sized_7.f90: New test.
+
 2017-10-02  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
        Backport from mainline

diff --git a/gcc/testsuite/gfortran.dg/zero_sized_7.f90 b/gcc/testsuite/gfortran.dg/zero_sized_7.f90
new file mode 100644 (file)
index 0000000..7908532
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/zero_sized_7.f90
@@ -0,0 +1,18 @@
+! { dg-do compile }
+! PR 80118 - this used to ICE
+! Original test case by Marco Restelli
+module m
+implicit none
+
+  integer, parameter :: not_empty(1) = 0
+  integer, parameter :: empty1(0) = (/integer :: /)
+  integer, parameter :: empty2(0) = 0
+
+contains
+
+ subroutine sub(v)
+  integer, allocatable, intent(out) :: v(:)
+   v = 2*empty2 ! internal compiler error
+ end subroutine sub
+
+end module m