diff options
| author | janus <janus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-10-01 11:41:41 +0000 |
|---|---|---|
| committer | janus <janus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-10-01 11:41:41 +0000 |
| commit | fc393cfcebe04c796c72286d4b0fdfd848c8d340 (patch) | |
| tree | 4513af351f32c0335af08877e33a022f8c519019 | |
| parent | 13a5f8b73b4cb7485ddf2699c935a5e0bc434ed6 (diff) | |
2011-10-01 Janus Weil <janus@gcc.gnu.org>
PR fortran/50585
* interface.c (get_expr_storage_size): Check if 'length' component is
associated.
2011-10-01 Janus Weil <janus@gcc.gnu.org>
PR fortran/50585
* gfortran.dg/assumed_charlen_arg_2.f90: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@179413 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/interface.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/assumed_charlen_arg_2.f90 | 16 |
4 files changed, 28 insertions, 1 deletions
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 <janus@gcc.gnu.org> + + PR fortran/50585 + * interface.c (get_expr_storage_size): Check if 'length' component is + associated. + 2011-09-29 Janus Weil <janus@gcc.gnu.org> 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 <janus@gcc.gnu.org> + + PR fortran/50585 + * gfortran.dg/assumed_charlen_arg_2.f90: New. + 2011-09-30 Janis Johnson <janisjo@codesourcery.com> 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 <sgm@objexx.com> + +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 |