backport: re PR fortran/83093 (ICE in fold_convert_loc, at fold-const.c:2266)

2018-01-10 Steven G. Kargl  <kargl@gcc.gnu.org>

	Backport from trunk
	PR fortran/83093
	* resolve.c (resolve_charlen): Check the type of cl->length
	after resolution.

2018-01-10  Steven G. Kargl  <kargl@gcc.gnu.org>

	Backport from trunk
	PR fortran/83093
	* gfortran.dg/allocate_with_typespec_7.f90: New test.

From-SVN: r256461

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3d7454b7b57ce05e8a01a195b864e6e862310b05..095b1bb7a15eff726a5f23702f8b1342b69e4fbb 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2018-01-10 Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       Backport from trunk
+       PR fortran/83093
+       * resolve.c (resolve_charlen): Check the type of cl->length
+       after resolution.
+
 2018-01-10  Steven G. Kargl  <kargl@kgcc.gnu.org>
 
        Backport r254555 from trunk

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 9b83779605abff570c556789a4ecadd9a1f02570..222fb7854c4a5fd27e310f99da39aa0c7bf1719a 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -11077,10 +11077,17 @@ resolve_charlen (gfc_charlen *cl)
          specification_expr = saved_specification_expr;
          return false;
        }
+
+      /* cl->length has been resolved.  It should have an integer type.  */
+      if (cl->length && cl->length->ts.type != BT_INTEGER)
+       {
+         gfc_error ("Scalar INTEGER expression expected at %L",
+                    &cl->length->where);
+         return false;
+       }
     }
   else
     {
-
       if (!resolve_index_expr (cl->length))
        {
          specification_expr = saved_specification_expr;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e4f50caf4a93869af5966c7cd884c93b7a094ccb..9304367256ada6580b3033865e78bdf6f1b154a3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-10  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       Backport from trunk
+       PR fortran/83093
+       * gfortran.dg/allocate_with_typespec_7.f90: New test.
+
 2018-01-10  Steven G. Kargl  <kargl@kgcc.gnu.org>
 
        Backport r254555 from trunk

diff --git a/gcc/testsuite/gfortran.dg/allocate_with_typespec_7.f90 b/gcc/testsuite/gfortran.dg/allocate_with_typespec_7.f90
new file mode 100644 (file)
index 0000000..feb6c8c
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/allocate_with_typespec_7.f90
@@ -0,0 +1,14 @@
+! { dg-do compile }
+! PR Fortran/83093
+! Contributed by Gerhard Steinmetz  <gscfq at t-online dot de>
+program p
+   integer, parameter :: n(2) = [1,2]
+   real :: x = 2
+   character(:), allocatable :: z, zz, zzz
+   character(:), allocatable :: y, yy
+   allocate (character(a) :: z)     ! { dg-error "Scalar INTEGER expression" }
+   allocate (character(x) :: zz)    ! { dg-error "Scalar INTEGER expression" }
+   allocate (character((1.0)) :: z) ! { dg-error "Scalar INTEGER expression" }
+   allocate (character(y) :: y)     ! { dg-error "Scalar INTEGER expression" }
+   allocate (character(n(1:2)) :: y)! { dg-error "Scalar INTEGER expression" }
+end