From: Tobias Burnus Date: Sat, 21 Jul 2012 09:27:04 +0000 (+0200) Subject: trans-expr.c (gfc_conv_derived_to_class): Fix argument passed to class_array_data_assign. X-Git-Tag: releases/gcc-4.8.0~4354 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51d03ec6c60bab761704af98f7042332de33c751;p=thirdparty%2Fgcc.git trans-expr.c (gfc_conv_derived_to_class): Fix argument passed to class_array_data_assign. 2012-07-21 Tobias Burnus * trans-expr.c (gfc_conv_derived_to_class): Fix argument passed to class_array_data_assign. From-SVN: r189739 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index f8558a67a3a7..04725e0a6d9e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2012-07-21 Tobias Burnus + + * trans-expr.c (gfc_conv_derived_to_class): Fix argument passed + to class_array_data_assign. + 2012-07-20 Tobias Burnus * decl.c (gfc_verify_c_interop_param): Allow assumed-shape diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index f5ed4e3cf3dd..e2c57e3990f7 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -307,8 +307,7 @@ gfc_conv_derived_to_class (gfc_se *parmse, gfc_expr *e, gfc_conv_expr_descriptor (parmse, e, ss); if (e->rank != class_ts.u.derived->components->as->rank) - class_array_data_assign (&parmse->pre, ctree, parmse->expr, - TREE_TYPE (parmse->expr)); + class_array_data_assign (&parmse->pre, ctree, parmse->expr, true); else gfc_add_modify (&parmse->pre, ctree, parmse->expr); }