aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/decl.c
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2015-10-30 16:26:59 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2015-10-30 16:26:59 +0000
commitdc0f176a1c2142d6814b9b47ed516c9a0b2b9592 (patch)
treea6154385dcaeb865e9c74b0186eda483530adef3 /gcc/fortran/decl.c
parente3316e3caaf2a009c44ed51bfa9047d0f80903bf (diff)
downloadgcc-dc0f176a1c2142d6814b9b47ed516c9a0b2b9592.zip
gcc-dc0f176a1c2142d6814b9b47ed516c9a0b2b9592.tar.gz
gcc-dc0f176a1c2142d6814b9b47ed516c9a0b2b9592.tar.bz2
re PR fortran/68154 (ICE on initializing character parameter array (explicit, implied))
2015-10-30 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/68154 * decl.c (add_init_expr_to_sym): if the char length in the typespec is NULL, check for and use a constructor. 2015-10-30 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/68154 *gfortran.dg/pr68154.f90 From-SVN: r229588
Diffstat (limited to 'gcc/fortran/decl.c')
-rw-r--r--gcc/fortran/decl.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 6a7f386..5a95fa4 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -1461,7 +1461,16 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus)
}
else if (init->expr_type == EXPR_ARRAY)
{
- clen = mpz_get_si (init->ts.u.cl->length->value.integer);
+ if (init->ts.u.cl)
+ clen = mpz_get_si (init->ts.u.cl->length->value.integer);
+ else if (init->value.constructor)
+ {
+ gfc_constructor *c;
+ c = gfc_constructor_first (init->value.constructor);
+ clen = c->expr->value.character.length;
+ }
+ else
+ gcc_unreachable ();
sym->ts.u.cl->length
= gfc_get_int_expr (gfc_default_integer_kind,
NULL, clen);