aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/trans-array.c
diff options
context:
space:
mode:
authorTobias Burnus <burnus@gcc.gnu.org>2011-06-12 00:08:46 +0200
committerTobias Burnus <burnus@gcc.gnu.org>2011-06-12 00:08:46 +0200
commit73039f89508e969ed62afc147dbf43634b8530ed (patch)
treebf3e74879ca320489a77db39ed14056addde3126 /gcc/fortran/trans-array.c
parentc51b58dc1f298bc8255758a51e94d5b7478b56ab (diff)
downloadgcc-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-array.c')
-rw-r--r--gcc/fortran/trans-array.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index c7aeadb..baf9060 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -5808,7 +5808,8 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss)
lse.string_length = rse.string_length;
tmp = gfc_trans_scalar_assign (&lse, &rse, expr->ts, true,
- expr->expr_type == EXPR_VARIABLE, true);
+ expr->expr_type == EXPR_VARIABLE
+ || expr->expr_type == EXPR_ARRAY, true);
gfc_add_expr_to_block (&block, tmp);
/* Finish the copying loops. */