diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2019-03-02 15:29:27 +0000 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gcc.gnu.org> | 2019-03-02 15:29:27 +0000 |
| commit | 4716603bf875cee4b4703bd139b6c2c1a3154886 (patch) | |
| tree | f5129b9f40cf7a44f253213ba73b49cb13f0183b /gcc/fortran | |
| parent | 574eaf0fda98b795daf6b588e3c0e878987f9769 (diff) | |
| download | gcc-4716603bf875cee4b4703bd139b6c2c1a3154886.zip gcc-4716603bf875cee4b4703bd139b6c2c1a3154886.tar.gz gcc-4716603bf875cee4b4703bd139b6c2c1a3154886.tar.bz2 | |
re PR fortran/89516 (ICE in gfc_calculate_transfer_sizes at gcc/fortran/check.c:5506)
2019-03-02 Harald Anlauf <anlauf@gmx.de>
PR fortran/89516
* check.c (gfc_calculate_transfer_sizes): Correct checks for cases
where storage size of elements of MOLD is 0.
PR fortran/89516
* gfortran.dg/pr89492.f90: Adjust testcase.
* gfortran.dg/transfer_check_5.f90: New test.
From-SVN: r269341
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/check.c | 24 |
2 files changed, 21 insertions, 9 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6adb90a..1a0ec41 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2019-03-02 Harald Anlauf <anlauf@gmx.de> + + PR fortran/89516 + * check.c (gfc_calculate_transfer_sizes): Correct checks for cases + where storage size of elements of MOLD is 0. + 2019-02-28 Thomas Schwinge <thomas@codesourcery.com> Cesar Philippidis <cesar@codesourcery.com> diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c index c5f6ae3..ee50634 100644 --- a/gcc/fortran/check.c +++ b/gcc/fortran/check.c @@ -5487,23 +5487,29 @@ 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) + /* If the storage size of SOURCE is greater than zero and MOLD is an array, + * a scalar with the type and type parameters of MOLD shall not have a + * storage size equal to zero. + * 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 SIZE is present, the result is an array of rank one and size SIZE. + */ + if (result_elt_size == 0 && *source_size > 0 && !size + && mold->expr_type == EXPR_ARRAY) { - gfc_error ("%<MOLD%> argument of %<TRANSFER%> intrinsic at %L " - "shall not have storage size 0 when %<SOURCE%> " + gfc_error ("%<MOLD%> argument of %<TRANSFER%> intrinsic at %L is an " + "array and shall not have storage size 0 when %<SOURCE%> " "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; + if (result_length_p) + *result_length_p = 0; return true; } |