diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2018-05-20 10:04:46 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2018-05-20 10:04:46 +0000 |
| commit | f82f425b56a1ccf1950c6d0992e7c106558acba0 (patch) | |
| tree | 1979e22abd5e448cee201ee6e3e3f4b88d8e102f /gcc/fortran/trans-stmt.c | |
| parent | 7c71e79664fbc04c3eb1d8b0307b33e502488664 (diff) | |
| download | gcc-f82f425b56a1ccf1950c6d0992e7c106558acba0.zip gcc-f82f425b56a1ccf1950c6d0992e7c106558acba0.tar.gz gcc-f82f425b56a1ccf1950c6d0992e7c106558acba0.tar.bz2 | |
re PR fortran/49636 ([F03] ASSOCIATE construct confused with slightly complicated case)
2018-05-20 Paul Thomas <pault@gcc.gnu.org>
PR fortran/49636
* trans-array.c (gfc_get_array_span): Renamed from
'get_array_span'.
(gfc_conv_expr_descriptor): Change references to above.
* trans-array.h : Add prototype for 'gfc_get_array_span'.
* trans-stmt.c (trans_associate_var): If the associate name is
a subref array pointer, use gfc_get_array_span for the span.
2018-05-20 Paul Thomas <pault@gcc.gnu.org>
PR fortran/49636
* gfortran.dg/associate_38.f90: New test.
From-SVN: r260414
Diffstat (limited to 'gcc/fortran/trans-stmt.c')
| -rw-r--r-- | gcc/fortran/trans-stmt.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index 1952f6c..cc1a429 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -1735,11 +1735,8 @@ trans_associate_var (gfc_symbol *sym, gfc_wrapped_block *block) if (sym->attr.subref_array_pointer) { gcc_assert (e->expr_type == EXPR_VARIABLE); - tmp = e->symtree->n.sym->ts.type == BT_CLASS - ? gfc_class_data_get (e->symtree->n.sym->backend_decl) - : e->symtree->n.sym->backend_decl; - tmp = gfc_get_element_type (TREE_TYPE (tmp)); - tmp = fold_convert (gfc_array_index_type, size_in_bytes (tmp)); + tmp = gfc_get_array_span (se.expr, e); + gfc_conv_descriptor_span_set (&se.pre, desc, tmp); } |