diff options
| author | Louis Krupp <louis.krupp@zoho.com> | 2016-10-07 02:24:40 +0000 |
|---|---|---|
| committer | Louis Krupp <lkrupp@gcc.gnu.org> | 2016-10-07 02:24:40 +0000 |
| commit | 4ee822df35cf031573ff85e05494afebacf9779a (patch) | |
| tree | 779aa76faf96f82c0c0ec81859bc06154a5551e1 /gcc/fortran/trans-array.c | |
| parent | ac193ee73ca85cae3e7c761f1bda491620b4ccab (diff) | |
| download | gcc-4ee822df35cf031573ff85e05494afebacf9779a.zip gcc-4ee822df35cf031573ff85e05494afebacf9779a.tar.gz gcc-4ee822df35cf031573ff85e05494afebacf9779a.tar.bz2 | |
[multiple changes]
2016-10-06 Louis Krupp <louis.krupp@zoho.com>
* gfortran.dg/pr69955.f90: New test.
2016-10-06 Louis Krupp <louis.krupp@zoho.com>
PR fortran/69955
* trans-array.c (gfc_conv_expr_descriptor): Don't allocate
components if it's not necessary.
From-SVN: r240851
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 50312fe..37cca79 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -6963,6 +6963,7 @@ gfc_conv_expr_descriptor (gfc_se *se, gfc_expr *expr) /* TODO: Optimize passing function return values. */ gfc_se lse; gfc_se rse; + bool deep_copy; /* Start the copying loops. */ gfc_mark_ss_chain_used (loop.temp_ss, 1); @@ -6993,9 +6994,12 @@ gfc_conv_expr_descriptor (gfc_se *se, gfc_expr *expr) gfc_add_block_to_block (&block, &lse.pre); lse.string_length = rse.string_length; + + deep_copy = !se->data_not_needed + && (expr->expr_type == EXPR_VARIABLE + || expr->expr_type == EXPR_ARRAY); tmp = gfc_trans_scalar_assign (&lse, &rse, expr->ts, - expr->expr_type == EXPR_VARIABLE - || expr->expr_type == EXPR_ARRAY, false); + deep_copy, false); gfc_add_expr_to_block (&block, tmp); /* Finish the copying loops. */ |