diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ef0da9a..0013101 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2013-07-16 Tobias Burnus <burnus@net-b.de> + + PR fortran/57912 + * trans-expr.c (gfc_trans_scalar_assign): Correct if + condition for caf realloc. + 2013-07-15 Tobias Burnus <burnus@net-b.de> * trans-array.h (gfc_deallocate_alloc_comp_no_caf, diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index e1ed9d9..de1e51b 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -6857,9 +6857,8 @@ gfc_trans_scalar_assign (gfc_se * lse, gfc_se * rse, gfc_typespec ts, fold_convert (TREE_TYPE (lse->expr), rse->expr)); /* Restore pointer address of coarray components. */ - if (ts.u.derived->attr.coarray_comp && deep_copy) + if (ts.u.derived->attr.coarray_comp && deep_copy && tmp_var != NULL_TREE) { - gcc_assert (tmp_var != NULL_TREE); tmp = gfc_reassign_alloc_comp_caf (ts.u.derived, tmp_var, lse->expr); tmp = build3_v (COND_EXPR, cond, build_empty_stmt (input_location), tmp); |