From ec2d749a10606629e257ff6e7a7435289c9068d8 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Tue, 26 Feb 2019 20:03:08 +0000 Subject: re PR fortran/89492 (Endless compilation of an invalid TRANSFER after r269177) 2019-02-26 Harald Anlauf PR fortran/89492 * check.c (gfc_calculate_transfer_sizes): Handle cases where storage size of elements of MOLD is 0. PR fortran/89492 * gfortran.dg/pr89492.f90: New test. From-SVN: r269227 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/check.c | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2646608..85ce5bc 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2019-02-26 Harald Anlauf + + PR fortran/89492 + * check.c (gfc_calculate_transfer_sizes): Handle cases where + storage size of elements of MOLD is 0. + 2019-02-26 Thomas Koenig PR fortran/89496 diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c index 0367c92..c5f6ae3 100644 --- a/gcc/fortran/check.c +++ b/gcc/fortran/check.c @@ -5487,6 +5487,26 @@ gfc_calculate_transfer_sizes (gfc_expr *source, gfc_expr *mold, gfc_expr *size, if (!gfc_element_size (mold, &result_elt_size)) return false; + if (result_elt_size == 0 && *source_size > 0) + { + gfc_error ("% argument of % intrinsic at %L " + "shall not have storage size 0 when % " + "argument has size greater than 0", &mold->where); + return false; + } + + /* If MOLD is a scalar and SIZE is absent, the result is a scalar. + * If MOLD is an array and SIZE is absent, the result is an array and of + * rank one. Its size is as small as possible such that its physical + * representation is not shorter than that of SOURCE. + */ + if (result_elt_size == 0 && *source_size == 0 && !size) + { + *result_size = 0; + *result_length_p = 0; + return true; + } + if ((result_elt_size > 0 && (mold->expr_type == EXPR_ARRAY || mold->rank)) || size) { -- cgit v1.1