From 29a94bf97da148775cedb260ca8581be9cc2bacd Mon Sep 17 00:00:00 2001 From: Paul Thomas Date: Sat, 29 Sep 2018 17:17:09 +0000 Subject: re PR fortran/65677 (Incomplete assignment on deferred-length character variable) 2018-09-29 Paul Thomas PR fortran/65667 * trans-expr.c (gfc_trans_assignment_1): If there is dependency fix the rse stringlength. 2018-09-29 Paul Thomas PR fortran/65667 * gfortran.dg/dependency_52.f90 : New test. From-SVN: r264715 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-expr.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 86d0a3e..ffada92 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2018-09-29 Paul Thomas + + PR fortran/65667 + * trans-expr.c (gfc_trans_assignment_1): If there is dependency + fix the rse stringlength. + 2018-09-25 Martin Liska PR fortran/87394 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 04210a4..9824848 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -10207,7 +10207,11 @@ gfc_trans_assignment_1 (gfc_expr * expr1, gfc_expr * expr2, bool init_flag, || TREE_CODE (rse.string_length) == INDIRECT_REF)) string_length = gfc_evaluate_now (rse.string_length, &rse.pre); else if (expr2->ts.type == BT_CHARACTER) - string_length = rse.string_length; + { + if (expr1->ts.deferred && gfc_check_dependency (expr1, expr2, false)) + rse.string_length = gfc_evaluate_now (rse.string_length, &rse.pre); + string_length = rse.string_length; + } else string_length = NULL_TREE; -- cgit v1.1