diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2013-01-12 19:52:11 +0100 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2013-01-12 19:52:11 +0100 |
| commit | ea73447aa346d1b44a508a1ddfd612de45d5f8ce (patch) | |
| tree | a71230bb5b028dc40d6653592542427418118ed2 /gcc/fortran/trans-array.c | |
| parent | f5acf0f24b8d53cb754c4ece3b5b54cbd4abb461 (diff) | |
| download | gcc-ea73447aa346d1b44a508a1ddfd612de45d5f8ce.zip gcc-ea73447aa346d1b44a508a1ddfd612de45d5f8ce.tar.gz gcc-ea73447aa346d1b44a508a1ddfd612de45d5f8ce.tar.bz2 | |
re PR fortran/55072 (Missing internal_pack leads to wrong code with derived type)
2013-01-12 Janus Weil <janus@gcc.gnu.org>
PR fortran/55072
* trans-array.c (gfc_conv_array_parameter): No packing was done for
full arrays of derived type.
2013-01-12 Janus Weil <janus@gcc.gnu.org>
PR fortran/55072
* gfortran.dg/assumed_type_2.f90: Fix test case.
* gfortran.dg/internal_pack_13.f90: New test.
* gfortran.dg/internal_pack_14.f90: New test.
From-SVN: r195125
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index d292eac..088a299 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -7002,20 +7002,14 @@ gfc_conv_array_parameter (gfc_se * se, gfc_expr * expr, bool g77, this_array_result = false; /* Passing address of the array if it is not pointer or assumed-shape. */ - if (full_array_var && g77 && !this_array_result) + if (full_array_var && g77 && !this_array_result + && sym->ts.type != BT_DERIVED && sym->ts.type != BT_CLASS) { tmp = gfc_get_symbol_decl (sym); if (sym->ts.type == BT_CHARACTER) se->string_length = sym->ts.u.cl->backend_decl; - if (sym->ts.type == BT_DERIVED || sym->ts.type == BT_CLASS) - { - gfc_conv_expr_descriptor (se, expr); - se->expr = gfc_conv_array_data (se->expr); - return; - } - if (!sym->attr.pointer && sym->as && sym->as->type != AS_ASSUMED_SHAPE |