From 818c36a85e3faec5442eb26799bfa3bba7764b36 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Fri, 7 Feb 2025 21:21:10 +0100 Subject: Fortran: fix initialization of allocatable non-deferred character [PR59252] PR fortran/59252 gcc/fortran/ChangeLog: * trans-expr.cc (gfc_trans_subcomponent_assign): Initialize allocatable non-deferred character with NULL properly. gcc/testsuite/ChangeLog: * gfortran.dg/allocatable_char_1.f90: New test. --- gcc/fortran/trans-expr.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gcc/fortran/trans-expr.cc') diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc index f923aeb..1329efc 100644 --- a/gcc/fortran/trans-expr.cc +++ b/gcc/fortran/trans-expr.cc @@ -9836,9 +9836,13 @@ gfc_trans_subcomponent_assign (tree dest, gfc_component * cm, tmp = gfc_trans_alloc_subarray_assign (tmp, cm, expr); gfc_add_expr_to_block (&block, tmp); } - else if (init && cm->attr.allocatable && expr->expr_type == EXPR_NULL) + else if (cm->attr.allocatable && expr->expr_type == EXPR_NULL + && (init + || (cm->ts.type == BT_CHARACTER + && !(cm->ts.deferred || cm->attr.pdt_string)))) { - /* NULL initialization for allocatable components. */ + /* NULL initialization for allocatable components. + Deferred-length character is dealt with later. */ gfc_add_modify (&block, dest, fold_convert (TREE_TYPE (dest), null_pointer_node)); } -- cgit v1.1