diff options
| author | Tobias Burnus <burnus@gcc.gnu.org> | 2014-03-27 22:17:43 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2014-03-27 22:17:43 +0100 |
| commit | 7651172f5905494f4bd79577969ebb44a22b4574 (patch) | |
| tree | d8bfaf1a66a5cf217cce963942f05930159f6066 /gcc/fortran/trans-expr.c | |
| parent | 117f16fbba31ecc4202d734d3ad7c618143c4a40 (diff) | |
| download | gcc-7651172f5905494f4bd79577969ebb44a22b4574.zip gcc-7651172f5905494f4bd79577969ebb44a22b4574.tar.gz gcc-7651172f5905494f4bd79577969ebb44a22b4574.tar.bz2 | |
re PR fortran/58880 ([OOP] ICE on valid with FINAL function and type extension)
2014-03-27 Tobias Burnus <burnus@net-b.de>
PR fortran/58880
* trans-expr.c (gfc_conv_scalar_to_descriptor): Fix handling
of nonpointers.
2014-03-27 Tobias Burnus <burnus@net-b.de>
PR fortran/58880
* gfortran.dg/finalize_24.f90: New.
From-SVN: r208879
Diffstat (limited to 'gcc/fortran/trans-expr.c')
| -rw-r--r-- | gcc/fortran/trans-expr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index f5350bb..9a6b40c 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -69,14 +69,16 @@ gfc_conv_scalar_to_descriptor (gfc_se *se, tree scalar, symbol_attribute attr) type = get_scalar_to_descriptor_type (scalar, attr); desc = gfc_create_var (type, "desc"); DECL_ARTIFICIAL (desc) = 1; + + if (!POINTER_TYPE_P (TREE_TYPE (scalar))) + scalar = gfc_build_addr_expr (NULL_TREE, scalar); gfc_add_modify (&se->pre, gfc_conv_descriptor_dtype (desc), gfc_get_dtype (type)); gfc_conv_descriptor_data_set (&se->pre, desc, scalar); /* Copy pointer address back - but only if it could have changed and if the actual argument is a pointer and not, e.g., NULL(). */ - if ((attr.pointer || attr.allocatable) - && attr.intent != INTENT_IN && POINTER_TYPE_P (TREE_TYPE (scalar))) + if ((attr.pointer || attr.allocatable) && attr.intent != INTENT_IN) gfc_add_modify (&se->post, scalar, fold_convert (TREE_TYPE (scalar), gfc_conv_descriptor_data_get (desc))); |