diff options
| author | Mikael Morin <mikael@gcc.gnu.org> | 2015-08-06 20:47:36 +0000 |
|---|---|---|
| committer | Mikael Morin <mikael@gcc.gnu.org> | 2015-08-06 20:47:36 +0000 |
| commit | ed673c00bfec3dafcd8d37114282c5c0f4c207d8 (patch) | |
| tree | 962fd58d54e846aff50066f35696155719afac5c /gcc/fortran/trans-array.c | |
| parent | 0eb6f71c48a4ee9d0c1dc85e31d8c135eb306d98 (diff) | |
| download | gcc-ed673c00bfec3dafcd8d37114282c5c0f4c207d8.zip gcc-ed673c00bfec3dafcd8d37114282c5c0f4c207d8.tar.gz gcc-ed673c00bfec3dafcd8d37114282c5c0f4c207d8.tar.bz2 | |
Move one condition out of gfc_trans_scalar_assign
* trans.h (gfc_trans_scalar_assign): Remove fourth argument.
* trans-expr.c (gfc_trans_scalar_assign): Merge fourth into sixth
argument.
(gfc_conv_subref_array_arg, gfc_trans_subarray_assign,
gfc_trans_subcomponent_assign, gfc_trans_assignment_1): Update callers.
* trans-array.c (gfc_conv_expr_descriptor): Ditto.
* trans-stmt.c (forall_make_variable_temp,
generate_loop_for_temp_to_lhs, generate_loop_for_rhs_to_temp,
gfc_trans_where_assign, gfc_trans_where_3): Ditto.
From-SVN: r226700
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index c4cdbae..1657739 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -6882,9 +6882,9 @@ gfc_conv_expr_descriptor (gfc_se *se, gfc_expr *expr) gfc_add_block_to_block (&block, &lse.pre); lse.string_length = rse.string_length; - tmp = gfc_trans_scalar_assign (&lse, &rse, expr->ts, true, + tmp = gfc_trans_scalar_assign (&lse, &rse, expr->ts, expr->expr_type == EXPR_VARIABLE - || expr->expr_type == EXPR_ARRAY, true); + || expr->expr_type == EXPR_ARRAY, false); gfc_add_expr_to_block (&block, tmp); /* Finish the copying loops. */ |