From: burnus Date: Tue, 11 Jun 2013 14:58:55 +0000 (+0000) Subject: 2013-06-11 Tobias Burnus X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86721945472eb9720464f93ee085370487b34ffb;p=thirdparty%2Fgcc.git 2013-06-11 Tobias Burnus PR fortran/57535 * trans-array.c (build_class_array_ref): Fix ICE for function result variables. 2013-06-11 Tobias Burnus PR fortran/57535 * gfortran.dg/class_array_18.f90: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199958 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 317d0da72d2e..6b37acd72fca 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2013-06-11 Tobias Burnus + + PR fortran/57535 + * trans-array.c (build_class_array_ref): Fix ICE for + function result variables. + 2013-06-08 Tobias Burnus PR fortran/37336 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 89f26d7d9766..a4321cc3e26b 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -2991,7 +2991,13 @@ build_class_array_ref (gfc_se *se, tree base, tree index) if (ts == NULL) return false; - if (class_ref == NULL) + if (class_ref == NULL && expr->symtree->n.sym->attr.function + && expr->symtree->n.sym == expr->symtree->n.sym->result) + { + gcc_assert (expr->symtree->n.sym->backend_decl == current_function_decl); + decl = gfc_get_fake_result_decl (expr->symtree->n.sym, 0); + } + else if (class_ref == NULL) decl = expr->symtree->n.sym->backend_decl; else { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f3bcb95c36ac..bb98acad6887 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-06-11 Tobias Burnus + + PR fortran/57535 + * gfortran.dg/class_array_18.f90: New. + 2013-06-11 Jan Hubicka PR c++/57551 diff --git a/gcc/testsuite/gfortran.dg/class_array_18.f90 b/gcc/testsuite/gfortran.dg/class_array_18.f90 new file mode 100644 index 000000000000..5f2f3dee7f22 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/class_array_18.f90 @@ -0,0 +1,16 @@ +! { dg-do compile } +! +! PR fortran/57535 +! +program test + implicit none + type t + integer :: ii = 55 + end type t +contains + function func2() + class(t), allocatable :: func2(:) + allocate(func2(3)) + func2%ii = [111,222,333] + end function func2 +end program test