diff options
| author | Thomas Schwinge <tschwinge@baylibre.com> | 2024-03-11 22:51:28 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@baylibre.com> | 2024-03-11 22:51:28 +0100 |
| commit | a95e21151a6366e7344d0f1983f99e318c5a7097 (patch) | |
| tree | 11d987406d9ce8399ec1736477d971ef09344df2 /gcc/fortran/trans-expr.cc | |
| parent | 02d394b2736afa9a24ab3e1b8ad56fd6ac37e0f4 (diff) | |
| parent | af4bb221153359f5948da917d5ef2df738bb1e61 (diff) | |
| download | gcc-a95e21151a6366e7344d0f1983f99e318c5a7097.zip gcc-a95e21151a6366e7344d0f1983f99e318c5a7097.tar.gz gcc-a95e21151a6366e7344d0f1983f99e318c5a7097.tar.bz2 | |
Merge commit 'af4bb221153359f5948da917d5ef2df738bb1e61' into HEAD
Diffstat (limited to 'gcc/fortran/trans-expr.cc')
| -rw-r--r-- | gcc/fortran/trans-expr.cc | 40 |
1 files changed, 34 insertions, 6 deletions
diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc index cca2f4e..1b8be08 100644 --- a/gcc/fortran/trans-expr.cc +++ b/gcc/fortran/trans-expr.cc @@ -10403,11 +10403,36 @@ gfc_trans_pointer_assignment (gfc_expr * expr1, gfc_expr * expr2) } if (expr1->ts.type == BT_CHARACTER - && expr1->symtree->n.sym->ts.deferred - && expr1->symtree->n.sym->ts.u.cl->backend_decl - && VAR_P (expr1->symtree->n.sym->ts.u.cl->backend_decl)) + && expr1->ts.deferred) { - tmp = expr1->symtree->n.sym->ts.u.cl->backend_decl; + gfc_symbol *psym = expr1->symtree->n.sym; + tmp = NULL_TREE; + if (psym->ts.type == BT_CHARACTER) + { + gcc_assert (psym->ts.u.cl->backend_decl + && VAR_P (psym->ts.u.cl->backend_decl)); + tmp = psym->ts.u.cl->backend_decl; + } + else if (expr1->ts.u.cl->backend_decl + && VAR_P (expr1->ts.u.cl->backend_decl)) + tmp = expr1->ts.u.cl->backend_decl; + else if (TREE_CODE (lse.expr) == COMPONENT_REF) + { + gfc_ref *ref = expr1->ref; + for (;ref; ref = ref->next) + { + if (ref->type == REF_COMPONENT + && ref->u.c.component->ts.type == BT_CHARACTER + && gfc_deferred_strlen (ref->u.c.component, &tmp)) + tmp = fold_build3_loc (input_location, COMPONENT_REF, + TREE_TYPE (tmp), + TREE_OPERAND (lse.expr, 0), + tmp, NULL_TREE); + } + } + + gcc_assert (tmp); + if (expr2->expr_type != EXPR_NULL) gfc_add_modify (&block, tmp, fold_convert (TREE_TYPE (tmp), strlen_rhs)); @@ -10723,7 +10748,7 @@ gfc_trans_scalar_assign (gfc_se * lse, gfc_se * rse, gfc_typespec ts, { tmp_var = gfc_evaluate_now (lse->expr, &lse->pre); tmp = gfc_deallocate_alloc_comp_no_caf (ts.u.derived, tmp_var, - 0, true); + 0, gfc_may_be_finalized (ts)); if (deep_copy) tmp = build3_v (COND_EXPR, cond, build_empty_stmt (input_location), tmp); @@ -11990,7 +12015,10 @@ gfc_trans_assignment_1 (gfc_expr * expr1, gfc_expr * expr2, bool init_flag, && !is_runtime_conformable (expr1, expr2); /* Only analyze the expressions for coarray properties, when in coarray-lib - mode. */ + mode. Avoid false-positive uninitialized diagnostics with initializing + the codimension flag unconditionally. */ + lhs_caf_attr.codimension = false; + rhs_caf_attr.codimension = false; if (flag_coarray == GFC_FCOARRAY_LIB) { lhs_caf_attr = gfc_caf_attr (expr1, false, &lhs_refs_comp); |