diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-10-30 16:26:59 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-10-30 16:26:59 +0000 |
| commit | dc0f176a1c2142d6814b9b47ed516c9a0b2b9592 (patch) | |
| tree | a6154385dcaeb865e9c74b0186eda483530adef3 | |
| parent | e3316e3caaf2a009c44ed51bfa9047d0f80903bf (diff) | |
| download | gcc-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
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr68154.f90 | 9 |
4 files changed, 30 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 587045d..74cae2f 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,4 +1,9 @@ -2015-10-29 Steven G. Kargl <kargl@gcc.gnu.org> +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/68054 * decl.c (match_attr_spec): PROTECTED can only be a module. 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); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ffefb43c..5407db7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-10-30 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/68154 + *gfortran.dg/pr68154.f90 + 2015-10-29 Nathan Sidwell <nathan@codesourcery.com> * c-c++-common/goacc/acc_on_device-2-off.c: Delete. diff --git a/gcc/testsuite/gfortran.dg/pr68154.f90 b/gcc/testsuite/gfortran.dg/pr68154.f90 new file mode 100644 index 0000000..6415eb0 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr68154.f90 @@ -0,0 +1,9 @@ +! { dg-do compile } +! PR fortran/68154 +! Original code contributed by Gerhard Steinmetz +! gerhard dot steinmetz dot fortran at t-online dot de +program p + character(1), parameter :: x1(2) = 'a' + character(*), parameter :: x2(2) = x1 + character(*), parameter :: x3(*) = x1 +end |