diff options
| author | Tobias Burnus <burnus@net-b.de> | 2013-06-11 16:58:55 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2013-06-11 16:58:55 +0200 |
| commit | bcb9f394630f75551cb1425798132b566bbc8b90 (patch) | |
| tree | 723677dd37685cf87d748a7f17c9b0bb3f83315f /gcc | |
| parent | dca61c7e6194d0f2942ced148e17bb05f688124c (diff) | |
| download | gcc-bcb9f394630f75551cb1425798132b566bbc8b90.zip gcc-bcb9f394630f75551cb1425798132b566bbc8b90.tar.gz gcc-bcb9f394630f75551cb1425798132b566bbc8b90.tar.bz2 | |
re PR fortran/57535 ([OOP] ICE when allocating a CLASS function-result variable)
2013-06-11 Tobias Burnus <burnus@net-b.de>
PR fortran/57535
* trans-array.c (build_class_array_ref): Fix ICE for
function result variables.
2013-06-11 Tobias Burnus <burnus@net-b.de>
PR fortran/57535
* gfortran.dg/class_array_18.f90: New.
From-SVN: r199958
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-array.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/class_array_18.f90 | 16 |
4 files changed, 34 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 317d0da..6b37acd7 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2013-06-11 Tobias Burnus <burnus@net-b.de> + + PR fortran/57535 + * trans-array.c (build_class_array_ref): Fix ICE for + function result variables. + 2013-06-08 Tobias Burnus <burnus@net-b.de> PR fortran/37336 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 89f26d7..a4321cc 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 f3bcb95..bb98aca 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-06-11 Tobias Burnus <burnus@net-b.de> + + PR fortran/57535 + * gfortran.dg/class_array_18.f90: New. + 2013-06-11 Jan Hubicka <jh@suse.cz> 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 0000000..5f2f3de --- /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 |