From e323640fb2d6fc3f9ed467b7dad246ce953441f8 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Sat, 1 Oct 2011 13:41:41 +0200 Subject: [PATCH] re PR fortran/50585 (ICE with assumed length character array argument) 2011-10-01 Janus Weil PR fortran/50585 * interface.c (get_expr_storage_size): Check if 'length' component is associated. 2011-10-01 Janus Weil PR fortran/50585 * gfortran.dg/assumed_charlen_arg_2.f90: New. From-SVN: r179413 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/interface.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ .../gfortran.dg/assumed_charlen_arg_2.f90 | 16 ++++++++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/assumed_charlen_arg_2.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ecd9fa3a740..c6bea2a28f7 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2011-10-01 Janus Weil + + PR fortran/50585 + * interface.c (get_expr_storage_size): Check if 'length' component is + associated. + 2011-09-29 Janus Weil PR fortran/50547 diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index f65087baff1..aa075a90401 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -1959,7 +1959,7 @@ get_expr_storage_size (gfc_expr *e) { /* The string length is the substring length. Set now to full string length. */ - if (ref->u.ss.length == NULL + if (!ref->u.ss.length || !ref->u.ss.length->length || ref->u.ss.length->length->expr_type != EXPR_CONSTANT) return 0; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d7b163a36f7..075edfc4008 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-10-01 Janus Weil + + PR fortran/50585 + * gfortran.dg/assumed_charlen_arg_2.f90: New. + 2011-09-30 Janis Johnson PR c++/44473 diff --git a/gcc/testsuite/gfortran.dg/assumed_charlen_arg_2.f90 b/gcc/testsuite/gfortran.dg/assumed_charlen_arg_2.f90 new file mode 100644 index 00000000000..e9481d8ec8e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/assumed_charlen_arg_2.f90 @@ -0,0 +1,16 @@ +! { dg-do compile } +! +! PR 50585: [4.6/4.7 Regression] ICE with assumed length character array argument +! +! Contributed by Stuart Mentzer + +SUBROUTINE SUB1( str ) + IMPLICIT NONE + CHARACTER(len=*) :: str(2) + CALL SUB2( str(1)(:3) ) +END SUBROUTINE + +SUBROUTINE SUB2( str ) + IMPLICIT NONE + CHARACTER(*) :: str +END SUBROUTINE -- 2.30.2