From a900a060926fd8e770a5e0b660b7b4eb3fd9155a Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Sat, 3 Mar 2018 18:20:32 +0000 Subject: [PATCH] re PR fortran/51434 (ICE with scalar init of an array parameter, used in DT default init with transfer) 2018-03-03 Steven G. Kargl PR fortran/51434 * simplify.c (gfc_simplify_transfer): Resolve mold. 2018-03-03 Steven G. Kargl PR fortran/51434 * gfortran.dg/pr51434.f90: New test. From-SVN: r258220 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/simplify.c | 9 ++++++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/pr51434.f90 | 19 +++++++++++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr51434.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5c99760e4c5..c04a552344c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2018-03-03 Steven G. Kargl + + PR fortran/51434 + * simplify.c (gfc_simplify_transfer): Resolve mold. + 2018-03-03 Paul Thomas PR fortran/80965 diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 324f85881c5..b130abacc52 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -25,6 +25,7 @@ along with GCC; see the file COPYING3. If not see #include "gfortran.h" #include "arith.h" #include "intrinsic.h" +#include "match.h" #include "target-memory.h" #include "constructor.h" #include "version.h" /* For version_string. */ @@ -7370,10 +7371,12 @@ gfc_simplify_transfer (gfc_expr *source, gfc_expr *mold, gfc_expr *size) unsigned char *buffer; size_t result_length; + if (!gfc_is_constant_expr (source) || !gfc_is_constant_expr (size)) + return NULL; - if (!gfc_is_constant_expr (source) - || (gfc_init_expr_flag && !gfc_is_constant_expr (mold)) - || !gfc_is_constant_expr (size)) + if (!gfc_resolve_expr (mold)) + return NULL; + if (gfc_init_expr_flag && !gfc_is_constant_expr (mold)) return NULL; if (!gfc_calculate_transfer_sizes (source, mold, size, &source_size, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ed9c809febd..2460b06280c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-03-03 Steven G. Kargl + + PR fortran/51434 + * gfortran.dg/pr51434.f90: New test. + 2018-03-03 Paolo Carlini PR c++/61358 diff --git a/gcc/testsuite/gfortran.dg/pr51434.f90 b/gcc/testsuite/gfortran.dg/pr51434.f90 new file mode 100644 index 00000000000..31679ec5d78 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr51434.f90 @@ -0,0 +1,19 @@ +! { dg-do run } +! PR fortran/51434 +module foo + implicit none + integer, parameter :: n = 5 + character(len=1), parameter :: s(n) = 'a' + type :: a + integer :: m = n + character(len=1):: t(n) = transfer('abcde ', s) + end type a +end module foo + +program bar + use foo + implicit none + type(a) c + if (c%m /= n) stop 1 + if (any(c%t /= ['a', 'b', 'c', 'd', 'e'])) stop 2 +end program bar -- 2.30.2