diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2019-05-19 12:32:55 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2019-05-19 12:32:55 +0000 |
| commit | d05ccada1798ac57d8d46abbca18ba122d8b85f3 (patch) | |
| tree | 41db59a00a654e2f7ceec3eb942d0ed4fd6def26 /gcc | |
| parent | 20733f1b0db2770532afaff274e9231de37e50fc (diff) | |
| download | gcc-d05ccada1798ac57d8d46abbca18ba122d8b85f3.zip gcc-d05ccada1798ac57d8d46abbca18ba122d8b85f3.tar.gz gcc-d05ccada1798ac57d8d46abbca18ba122d8b85f3.tar.bz2 | |
re PR fortran/90498 (ICE with select type/associate and derived type argument containing class(*))
2019-05-19 Paul Thomas <pault@gcc.gnu.org>
PR fortran/90498
* trans-stmt.c (trans_associate_var) Do not use the saved
descriptor if the expression is a COMPONENT_REF.
2019-05-19 Paul Thomas <pault@gcc.gnu.org>
PR fortran/90498
* gfortran.dg/associate_48.f90 : New test.
From-SVN: r271380
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-stmt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/associate_48.f90 | 41 |
4 files changed, 55 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a8e188c..dd54e59 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2019-05-19 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/90498 + * trans-stmt.c (trans_associate_var) Do not use the saved + descriptor if the expression is a COMPONENT_REF. + 2019-05-19 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/90329 diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index b9966ed..5fa182b 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -1858,7 +1858,8 @@ trans_associate_var (gfc_symbol *sym, gfc_wrapped_block *block) { if (e->symtree && DECL_LANG_SPECIFIC (e->symtree->n.sym->backend_decl) - && GFC_DECL_SAVED_DESCRIPTOR (e->symtree->n.sym->backend_decl)) + && GFC_DECL_SAVED_DESCRIPTOR (e->symtree->n.sym->backend_decl) + && TREE_CODE (target_expr) != COMPONENT_REF) /* Use the original class descriptor stored in the saved descriptor to get the target_expr. */ target_expr = diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1352e61..fe971aa 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-05-19 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/90498 + * gfortran.dg/associate_48.f90 : New test. + 2019-05-19 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/78290 @@ -429,7 +434,7 @@ 2019-05-15 Iain Sandoe <iain@sandoe.co.uk> - * lib/target-supports.exp + * lib/target-supports.exp (check_effective_target_powerpc_p8vector_ok): No support for Darwin. (check_effective_target_powerpc_p9vector_ok): Likewise. (check_effective_target_powerpc_float128_sw_ok): Likewise. diff --git a/gcc/testsuite/gfortran.dg/associate_48.f90 b/gcc/testsuite/gfortran.dg/associate_48.f90 new file mode 100644 index 0000000..5ce3a49 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/associate_48.f90 @@ -0,0 +1,41 @@ +! { dg=do run } +! +! Test the fix for PR90498. +! +! Contributed by Vladimir Fuka <vladimir.fuka@gmail.com> +! + type field_names_a + class(*), pointer :: var(:) =>null() + end type + + type(field_names_a),pointer :: a(:) + allocate (a(2)) + + allocate (a(1)%var(2), source = ["hello"," vlad"]) + allocate (a(2)%var(2), source = ["HELLO"," VLAD"]) + call s(a) + deallocate (a(1)%var) + deallocate (a(2)%var) + deallocate (a) +contains + subroutine s(a) + + type(field_names_a) :: a(:) + + select type (var => a(1)%var) + type is (character(*)) + if (any (var .ne. ["hello"," vlad"])) stop 1 + class default + stop + end select + + associate (var => a(2)%var) + select type (var) + type is (character(*)) + if (any (var .ne. ["HELLO"," VLAD"])) stop 2 + class default + stop + end select + end associate + end +end |