From 4716603bf875cee4b4703bd139b6c2c1a3154886 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Sat, 2 Mar 2019 15:29:27 +0000 Subject: [PATCH] re PR fortran/89516 (ICE in gfc_calculate_transfer_sizes at gcc/fortran/check.c:5506) 2019-03-02 Harald Anlauf 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 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/check.c | 24 +++++++++++++++--------- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gfortran.dg/pr89492.f90 | 4 ++-- gcc/testsuite/gfortran.dg/transfer_check_5.f90 | 14 ++++++++++++++ 5 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/transfer_check_5.f90 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 + + 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 Cesar Philippidis 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 ("% argument of % intrinsic at %L " - "shall not have storage size 0 when % " + gfc_error ("% argument of % intrinsic at %L is an " + "array and 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; + if (result_length_p) + *result_length_p = 0; return true; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e6a83b0..92c9b1e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-03-02 Harald Anlauf + + PR fortran/89516 + * gfortran.dg/pr89492.f90: Adjust testcase. + * gfortran.dg/transfer_check_5.f90: New test. + 2019-03-02 Jakub Jelinek PR c++/71446 diff --git a/gcc/testsuite/gfortran.dg/pr89492.f90 b/gcc/testsuite/gfortran.dg/pr89492.f90 index 1a21f4a..0040551 100644 --- a/gcc/testsuite/gfortran.dg/pr89492.f90 +++ b/gcc/testsuite/gfortran.dg/pr89492.f90 @@ -19,9 +19,9 @@ program bug4a integer, parameter :: n(l) = l print *, k,i,l,m,j,n print *, transfer(1,['']) ! { dg-error "shall not have storage size 0" } - print *, transfer(1, '' ) ! { dg-error "shall not have storage size 0" } + print *, transfer(1, '' ) ! No error print *, size(transfer(1,[''])) ! { dg-error "shall not have storage size 0" } - print *, len (transfer(1, '' )) ! { dg-error "shall not have storage size 0" } + print *, len (transfer(1, '' )) ! No error print *, size(transfer([1],[bug4()])) ! { dg-error "shall not have storage size 0" } print *, transfer(transfer([1],[bug4()]),[1]) ! { dg-error "shall not have storage size 0" } end program bug4a diff --git a/gcc/testsuite/gfortran.dg/transfer_check_5.f90 b/gcc/testsuite/gfortran.dg/transfer_check_5.f90 new file mode 100644 index 0000000..4e416e1 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/transfer_check_5.f90 @@ -0,0 +1,14 @@ +! { dg-do compile } +! { dg-options "-Wsurprising" } +! +! PR fortran/89516 - ICE in gfc_calculate_transfer_sizes at gcc/fortran/check.c:5506 +! Found by Martin Liška + +program test + character(*), parameter :: n = '' + character(*), parameter :: o = transfer ([''], n) + print *, transfer(1,'',size=0) ! No warning + print *, transfer(1,'',size=1) ! No warning + print *, transfer('',1,size=0) ! No warning + print *, transfer('',1,size=1) ! { dg-warning "has partly undefined result" } +end program test -- 2.7.4