diff options
| author | Mikael Morin <mikael@gcc.gnu.org> | 2015-05-16 08:09:52 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2015-05-16 08:09:52 +0000 |
| commit | e24ba4ab129b4506c413831c3392d47119482c22 (patch) | |
| tree | 7b9dec81021cac5ea71da5192b1c5d992cc8ca68 /gcc/fortran | |
| parent | 30a5d3e6185a5fa01aec283ae9efe8b739dffdf9 (diff) | |
| download | gcc-e24ba4ab129b4506c413831c3392d47119482c22.zip gcc-e24ba4ab129b4506c413831c3392d47119482c22.tar.gz gcc-e24ba4ab129b4506c413831c3392d47119482c22.tar.bz2 | |
2015-05-16 Mikael Morin <mikael@gcc.gnu.org
Paul Thomas <pault@gcc.gnu.org>
PR fortran/65792
* trans-expr.c (gfc_trans_subcomponent_assign): Always assign
the expression component to the destination. In addition, if
the component has allocatable components, copy them and
deallocate those of the expression, if it is not a variable.
The expression is fixed if not a variable to prevent multiple
evaluations.
2015-05-16 Mikael Morin <mikael@gcc.gnu.org>
PR fortran/65792
* gfortran.dg/derived_constructor_components_5: New test
From-SVN: r223234
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 15 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 20 |
2 files changed, 29 insertions, 6 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 1b455b5..c06627e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,14 @@ +2015-05-16 Mikael Morin <mikael@gcc.gnu.org + Paul Thomas <pault@gcc.gnu.org> + + PR fortran/65792 + * trans-expr.c (gfc_trans_subcomponent_assign): Always assign + the expression component to the destination. In addition, if + the component has allocatable components, copy them and + deallocate those of the expression, if it is not a variable. + The expression is fixed if not a variable to prevent multiple + evaluations. + 2015-05-12 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/66111 @@ -133,12 +144,12 @@ to be referenced always. (build_class_array_ref): Adapt retrieval of array descriptor. (build_array_ref): Likewise. - (gfc_conv_array_ref): Hand the vptr or the descriptor to + (gfc_conv_array_ref): Hand the vptr or the descriptor to build_array_ref depending whether the sym is class or not. (gfc_trans_array_cobounds): Select correct gfc_array_spec for regular and class arrays. (gfc_trans_array_bounds): Likewise. - (gfc_trans_dummy_array_bias): Likewise. + (gfc_trans_dummy_array_bias): Likewise. (gfc_get_dataptr_offset): Correcting call of build_array_ref. (gfc_conv_expr_descriptor): Set the array's offset to -1 when lbound in inner most dim is 1 and symbol non-pointer/assoc. diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index c71037f..9be8a42 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -7050,19 +7050,31 @@ gfc_trans_subcomponent_assign (tree dest, gfc_component * cm, gfc_expr * expr, { if (expr->expr_type != EXPR_STRUCTURE) { + tree dealloc = NULL_TREE; gfc_init_se (&se, NULL); gfc_conv_expr (&se, expr); gfc_add_block_to_block (&block, &se.pre); + /* Prevent repeat evaluations in gfc_copy_alloc_comp by fixing the + expression in a temporary variable and deallocate the allocatable + components. Then we can the copy the expression to the result. */ if (cm->ts.u.derived->attr.alloc_comp - && expr->expr_type == EXPR_VARIABLE) + && expr->expr_type != EXPR_VARIABLE) + { + se.expr = gfc_evaluate_now (se.expr, &block); + dealloc = gfc_deallocate_alloc_comp (cm->ts.u.derived, se.expr, + expr->rank); + } + gfc_add_modify (&block, dest, + fold_convert (TREE_TYPE (dest), se.expr)); + if (cm->ts.u.derived->attr.alloc_comp + && expr->expr_type != EXPR_NULL) { tmp = gfc_copy_alloc_comp (cm->ts.u.derived, se.expr, dest, expr->rank); gfc_add_expr_to_block (&block, tmp); + if (dealloc != NULL_TREE) + gfc_add_expr_to_block (&block, dealloc); } - else - gfc_add_modify (&block, dest, - fold_convert (TREE_TYPE (dest), se.expr)); gfc_add_block_to_block (&block, &se.post); } else |