diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/char_component_initializer_3.f90 | 6 |
4 files changed, 22 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 48c533d..1ea1c2c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2016-11-22 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/78479 + * expr.c (gfc_apply_init): Allocate a charlen if needed. + 2016-11-22 Janus Weil <janus@gcc.gnu.org> PR fortran/78443 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index e2d1311..b028d81 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -4132,7 +4132,12 @@ gfc_apply_init (gfc_typespec *ts, symbol_attribute *attr, gfc_expr *init) { gfc_set_constant_character_len (len, ctor->expr, has_ts ? -1 : first_len); - ctor->expr->ts.u.cl->length = gfc_copy_expr (ts->u.cl->length); + if (!ctor->expr->ts.u.cl) + ctor->expr->ts.u.cl + = gfc_new_charlen (gfc_current_ns, ts->u.cl); + else + ctor->expr->ts.u.cl->length + = gfc_copy_expr (ts->u.cl->length); } } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d18ad6d..bb5ce39 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-11-22 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/78479 + * gfortran.dg/char_component_initializer_3.f90: New test. + 2016-11-22 Jakub Jelinek <jakub@redhat.com> PR target/78451 diff --git a/gcc/testsuite/gfortran.dg/char_component_initializer_3.f90 b/gcc/testsuite/gfortran.dg/char_component_initializer_3.f90 new file mode 100644 index 0000000..634da4a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/char_component_initializer_3.f90 @@ -0,0 +1,6 @@ +! { dg-do compile } +program p + type t + character(3) :: c(1) = 'a' // ['b'] + end type +end |