diff options
| author | Tobias Burnus <burnus@net-b.de> | 2012-01-27 14:08:52 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2012-01-27 14:08:52 +0100 |
| commit | 102344e274f23609bc9bc008ded4a6fd501e5549 (patch) | |
| tree | de5f3b6f1b72f66e6ec9b8487e790dcc491f196d /gcc/fortran/expr.c | |
| parent | 4cb2a86715695603f8abf1396436b68a7281221b (diff) | |
| download | gcc-102344e274f23609bc9bc008ded4a6fd501e5549.zip gcc-102344e274f23609bc9bc008ded4a6fd501e5549.tar.gz gcc-102344e274f23609bc9bc008ded4a6fd501e5549.tar.bz2 | |
re PR fortran/51970 ([OOP] gimplification failed for polymorphic MOVE_ALLOC)
2012-01-27 Tobias Burnus <burnus@net-b.de>
PR fortran/51970
PR fortran/51977
* primary.c (gfc_match_varspec. gfc_match_rvalue): Set
handle array spec for BT_CLASS.
* expr.c (gfc_get_variable_expr, gfc_lval_expr_from_sym)
* frontend-passes.c (create_var): Ditto.
* resolve.c (resolve_actual_arglist, resolve_assoc_var): Ditto.
* trans-decl.c (gfc_trans_deferred_vars): Use class_pointer
instead of attr.pointer.
(gfc_generate_function_code): Use CLASS_DATA (sym) for BT_CLASS.
* trans-intrinsic.c (conv_intrinsic_move_alloc): Move assert.
* trans-stmt.c (trans_associate_var): Ask for the descriptor.
2012-01-27 Tobias Burnus <burnus@net-b.de>
PR fortran/51970
PR fortran/51977
* gfortran.dg/move_alloc_13.f90: New.
From-SVN: r183622
Diffstat (limited to 'gcc/fortran/expr.c')
| -rw-r--r-- | gcc/fortran/expr.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 7cea780..c401313 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -3805,9 +3805,12 @@ gfc_get_variable_expr (gfc_symtree *var) e->symtree = var; e->ts = var->n.sym->ts; - if (var->n.sym->as != NULL) + if ((var->n.sym->as != NULL && var->n.sym->ts.type != BT_CLASS) + || (var->n.sym->ts.type == BT_CLASS && CLASS_DATA (var->n.sym) + && CLASS_DATA (var->n.sym)->as)) { - e->rank = var->n.sym->as->rank; + e->rank = var->n.sym->ts.type == BT_CLASS + ? CLASS_DATA (var->n.sym)->as->rank : var->n.sym->as->rank; e->ref = gfc_get_ref (); e->ref->type = REF_ARRAY; e->ref->u.ar.type = AR_FULL; @@ -3836,7 +3839,8 @@ gfc_lval_expr_from_sym (gfc_symbol *sym) lval->ref->u.ar.type = AR_FULL; lval->ref->u.ar.dimen = lval->rank; lval->ref->u.ar.where = sym->declared_at; - lval->ref->u.ar.as = sym->as; + lval->ref->u.ar.as = sym->ts.type == BT_CLASS + ? CLASS_DATA (sym)->as : sym->as; } return lval; |