From 7a760f1977cd1f6f31f9482f3efdefa2ac2de824 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Wed, 10 Jan 2018 22:35:00 +0000 Subject: [PATCH] backport: re PR fortran/83093 (ICE in fold_convert_loc, at fold-const.c:2266) 2018-01-10 Steven G. Kargl Backport from trunk PR fortran/83093 * resolve.c (resolve_charlen): Check the type of cl->length after resolution. 2018-01-10 Steven G. Kargl Backport from trunk PR fortran/83093 * gfortran.dg/allocate_with_typespec_7.f90: New test. From-SVN: r256459 --- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/resolve.c | 9 ++++++++- gcc/testsuite/ChangeLog | 6 ++++++ .../gfortran.dg/allocate_with_typespec_7.f90 | 14 ++++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/allocate_with_typespec_7.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ff6d4e86933..c8f7755d406 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2018-01-10 Steven G. Kargl + + Backport from trunk + PR fortran/83093 + * resolve.c (resolve_charlen): Check the type of cl->length + after resolution. + 2018-01-10 Steven G. Kargl Backport r254555 from trunk diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 4ef7abdea2d..2f96610e2e8 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -11458,10 +11458,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 5816836e846..5ea37845bc3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-01-10 Steven G. Kargl + + Backport from trunk + PR fortran/83093 + * gfortran.dg/allocate_with_typespec_7.f90: New test. + 2018-01-10 Steven G. Kargl 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 index 00000000000..feb6c8c16cf --- /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 +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