diff options
author | Tobias Burnus <burnus@net-b.de> | 2011-12-19 16:30:23 +0100 |
---|---|---|
committer | Tobias Burnus <burnus@gcc.gnu.org> | 2011-12-19 16:30:23 +0100 |
commit | cd99c23ca41f9fb6792e39f0e91a950cf1e531aa (patch) | |
tree | 2d37421d992c8c2c8df7d5e8606294c36915d130 /gcc/fortran/resolve.c | |
parent | 6a9ceb1703fcf307cdeb4abab80e535d98857122 (diff) | |
download | gcc-cd99c23ca41f9fb6792e39f0e91a950cf1e531aa.zip gcc-cd99c23ca41f9fb6792e39f0e91a950cf1e531aa.tar.gz gcc-cd99c23ca41f9fb6792e39f0e91a950cf1e531aa.tar.bz2 |
re PR fortran/51605 (internal compiler error gfc_trans_block_construct, at fortran/trans-stmt.c:984)
2011-12-19 Tobias Burnus <burnus@net-b.de>
PR fortran/51605
* match.c (gfc_match_select_type): Handle
scalar polymophic coarrays.
(select_type_set_tmp, ): Ditto; avoid segfault if !class_ok.
* primary.c (gfc_match_rvalue): Avoid segfault if !class_ok.
* resolve.c (resolve_select_type): Ditto.
(resolve_assoc_var): Fix setting the TARGET attribute for
polymorphic selectors which are pointers.
2011-12-19 Tobias Burnus <burnus@net-b.de>
PR fortran/51605
* gfortran.dg/select_type_25.f90: New.
From-SVN: r182484
Diffstat (limited to 'gcc/fortran/resolve.c')
-rw-r--r-- | gcc/fortran/resolve.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 5e8371a..4bfdb79 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -7817,9 +7817,12 @@ resolve_assoc_var (gfc_symbol* sym, bool resolve_target) sym->attr.asynchronous = tsym->attr.asynchronous; sym->attr.volatile_ = tsym->attr.volatile_; - sym->attr.target = (tsym->attr.target || tsym->attr.pointer); + if (tsym->ts.type == BT_CLASS) + sym->attr.target = tsym->attr.target || CLASS_DATA (tsym)->attr.pointer; + else + sym->attr.target = tsym->attr.target || tsym->attr.pointer; - if (sym->ts.type == BT_DERIVED && target->symtree->n.sym->ts.type == BT_CLASS) + if (sym->ts.type == BT_DERIVED && tsym->ts.type == BT_CLASS) target->rank = sym->as ? sym->as->rank : 0; } @@ -7887,6 +7890,9 @@ resolve_select_type (gfc_code *code, gfc_namespace *old_ns) return; } + if (!code->expr1->symtree->n.sym->attr.class_ok) + return; + if (code->expr2) { if (code->expr1->symtree->n.sym->attr.untyped) |