From a38e64ad03911fa82983f54c283dd49f6d40380f Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Thu, 18 Jan 2018 00:30:42 +0000 Subject: [PATCH] backport: re PR fortran/83874 (ICE initializing character array from derived type) 2018-01-17 Harald Anlauf Backport from mainline PR fortran/83874 * decl.c (add_init_expr_to_sym): Do not dereference NULL pointer. 2018-01-17 Harald Anlauf Backport from mainline PR fortran/83874 * gfortran.dg/pr83874.f90: New test. From-SVN: r256829 --- gcc/fortran/ChangeLog | 8 +++++++- gcc/fortran/decl.c | 2 +- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gfortran.dg/pr83874.f90 | 19 +++++++++++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr83874.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0d1607d2ddd..14cc03a0215 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,4 +1,10 @@ -2012-01-13 Steven G. Kargl +2018-01-17 Harald Anlauf + + Backport from mainline + PR fortran/83874 + * decl.c (add_init_expr_to_sym): Do not dereference NULL pointer. + +2018-01-13 Steven G. Kargl Backport from mainline PR fortran/78814 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 1cbf23819a9..4ccaa4c8d1a 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -1692,7 +1692,7 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus) } else if (init->expr_type == EXPR_ARRAY) { - if (init->ts.u.cl) + if (init->ts.u.cl && init->ts.u.cl->length) { const gfc_expr *length = init->ts.u.cl->length; if (length->expr_type != EXPR_CONSTANT) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f674940a6a9..d098f41ac39 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-01-17 Harald Anlauf + + Backport from mainline + PR fortran/83874 + * gfortran.dg/pr83874.f90: New test. + 2018-01-17 Richard Biener Backport from mainline diff --git a/gcc/testsuite/gfortran.dg/pr83874.f90 b/gcc/testsuite/gfortran.dg/pr83874.f90 new file mode 100644 index 00000000000..d1bdc97b783 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr83874.f90 @@ -0,0 +1,19 @@ +! { dg-do run } +! PR fortran/83874 +! There was an ICE while initializing the character arrays +! +! Contributed by Harald Anlauf +! +program charinit + implicit none + type t + character(len=1) :: name + end type t + type(t), parameter :: z(2)= [ t ('a'), t ('b') ] + character(len=1), parameter :: names1(*) = z% name + character(len=*), parameter :: names2(2) = z% name + character(len=*), parameter :: names3(*) = z% name + if (.not. (names1(1) == "a" .and. names1(2) == "b")) call abort () + if (.not. (names2(1) == "a" .and. names2(2) == "b")) call abort () + if (.not. (names3(1) == "a" .and. names3(2) == "b")) call abort () +end program charinit