diff options
| author | Tobias Burnus <burnus@gcc.gnu.org> | 2011-06-12 00:08:46 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2011-06-12 00:08:46 +0200 |
| commit | 73039f89508e969ed62afc147dbf43634b8530ed (patch) | |
| tree | bf3e74879ca320489a77db39ed14056addde3126 /gcc/fortran/trans-expr.c | |
| parent | c51b58dc1f298bc8255758a51e94d5b7478b56ab (diff) | |
| download | gcc-73039f89508e969ed62afc147dbf43634b8530ed.zip gcc-73039f89508e969ed62afc147dbf43634b8530ed.tar.gz gcc-73039f89508e969ed62afc147dbf43634b8530ed.tar.bz2 | |
2011-06-12 Tobias Burnus
PR fortran/49324
* trans-expr.c (gfc_trans_assignment_1): Tell
gfc_trans_scalar_assign to also deep-copy RHS nonvariables
with allocatable components.
* trans-array.c (gfc_conv_expr_descriptor): Ditto.
2011-06-12 Tobias Burnus
PR fortran/49324
* gfortran.dg/alloc_comp_assign_11.f90: New.
From-SVN: r174959
Diffstat (limited to 'gcc/fortran/trans-expr.c')
| -rw-r--r-- | gcc/fortran/trans-expr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index da4af1a..7383265 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -6155,8 +6155,8 @@ gfc_trans_assignment_1 (gfc_expr * expr1, gfc_expr * expr2, bool init_flag, tmp = gfc_trans_scalar_assign (&lse, &rse, expr1->ts, l_is_temp || init_flag, - expr_is_variable (expr2) || scalar_to_array, - dealloc); + expr_is_variable (expr2) || scalar_to_array + || expr2->expr_type == EXPR_ARRAY, dealloc); gfc_add_expr_to_block (&body, tmp); if (lss == gfc_ss_terminator) |