aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/trans-expr.c
diff options
context:
space:
mode:
authorPaul Thomas <pault@gcc.gnu.org>2018-09-29 17:17:09 +0000
committerPaul Thomas <pault@gcc.gnu.org>2018-09-29 17:17:09 +0000
commit29a94bf97da148775cedb260ca8581be9cc2bacd (patch)
tree3db1412bb47145048bd7de1b5f99b5fe113c35a1 /gcc/fortran/trans-expr.c
parent7d583f4259a56c9054c28e883c375f9c57f8755d (diff)
downloadgcc-29a94bf97da148775cedb260ca8581be9cc2bacd.zip
gcc-29a94bf97da148775cedb260ca8581be9cc2bacd.tar.gz
gcc-29a94bf97da148775cedb260ca8581be9cc2bacd.tar.bz2
re PR fortran/65677 (Incomplete assignment on deferred-length character variable)
2018-09-29 Paul Thomas <pault@gcc.gnu.org> PR fortran/65667 * trans-expr.c (gfc_trans_assignment_1): If there is dependency fix the rse stringlength. 2018-09-29 Paul Thomas <pault@gcc.gnu.org> PR fortran/65667 * gfortran.dg/dependency_52.f90 : New test. From-SVN: r264715
Diffstat (limited to 'gcc/fortran/trans-expr.c')
-rw-r--r--gcc/fortran/trans-expr.c6
1 files changed, 5 insertions, 1 deletions
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;