diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/module_read_2.f90 | 30 |
4 files changed, 44 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 88fe30e..0c802b6 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2010-03-01 Tobias Burnus <burnus@net-b.de> + + PR fortran/43199 + * resolve.c (find_array_spec): Handle REF_COMPONENT with + CLASS components. + 2010-02-28 Tobias Burnus <burnus@net-b.de> PR fortran/43205 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 4f9eb01..8de0de6 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -4007,6 +4007,9 @@ find_array_spec (gfc_expr *e) if (derived == NULL) derived = e->symtree->n.sym->ts.u.derived; + if (derived->attr.is_class) + derived = derived->components->ts.u.derived; + c = derived->components; for (; c; c = c->next) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d6d79c4..4bb68cc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-03-01 Tobias Burnus <burnus@net-b.de> + + PR fortran/43199 + * gfortran.dg/module_read_2.f90: New test. + 2010-02-27 Mark Mitchell <mark@codesourcery.com> PR c++/42748 diff --git a/gcc/testsuite/gfortran.dg/module_read_2.f90 b/gcc/testsuite/gfortran.dg/module_read_2.f90 new file mode 100644 index 0000000..d001ca7 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/module_read_2.f90 @@ -0,0 +1,30 @@ +! { dg-do run } +! +! PR fortran/43199 +! +! This program gave an ICE due to reading the REF_COMPONENT with CLASS. +! +module m_string + type t_string + character, dimension(:), allocatable :: string + end type t_string +contains +pure function string_to_char ( s ) result(res) + class(t_string), intent(in) :: s + character(len=size(s%string)) :: res + integer :: i + do i = 1,len(res) + res(i:i) = s%string(i) + end do +end function string_to_char +end module m_string + +use m_string +type(t_string) :: str +allocate(str%string(5)) +str%string = ['H','e','l','l','o'] +if (len (string_to_char (str)) /= 5) call abort () +if (string_to_char (str) /= "Hello") call abort () +end + +! { dg-final { cleanup-modules "m_string" } } |