On Sat, Mar 28, 2015 at 01:01:57AM +0100, Dominique Dhumieres wrote:
>
> AFAICT your test succeeds without your patch and does not test that the ICE
> reported by FX is gone (indeed it is with your patch).
>
New patch and testcase. The ChangeLog entries are in the
original email. Built and tested on x86_64-*-freebsd.
OK, now?
--
Steve
Index: gcc/fortran/decl.c
===================================================================
--- gcc/fortran/decl.c (revision 220943)
+++ gcc/fortran/decl.c (working copy)
@@ -1404,9 +1404,7 @@ add_init_expr_to_sym (const char *name,
}
else if (init->expr_type == EXPR_ARRAY)
{
- gfc_constructor *c;
- c = gfc_constructor_first (init->value.constructor);
- clen = c->expr->value.character.length;
+ clen = mpz_get_si (init->ts.u.cl->length->value.integer);
sym->ts.u.cl->length
= gfc_get_int_expr (gfc_default_integer_kind,
NULL, clen);
Index: gcc/testsuite/gfortran.dg/pr65429.f90
===================================================================
--- gcc/testsuite/gfortran.dg/pr65429.f90 (revision 0)
+++ gcc/testsuite/gfortran.dg/pr65429.f90 (working copy)
@@ -0,0 +1,19 @@
+! { dg-do run }
+! PR fortran/65429
+program foo
+
+ implicit none
+
+ character(*), parameter :: s(*) = [ character(5) :: 'abcde', 'fghij' ]
+ character(*), parameter :: t(*) = [ character(31) :: ]
+ character(*), parameter :: u(*) = [ 'qwerty', 'asdfgh', 'zxcvbn']
+ character(*), parameter :: v(*) = ['','']
+
+ if ((size(s) /= 2).or.(len(s)/=5)) call abort
+ if ((size(t) /= 0).or.(len(t)/=31)) call abort
+ if ((size(u) /= 3).or.(len(u)/=6)) call abort
+ if ((size(v) /= 2).or.(len(v)/=0)) call abort
+ if ((s(1)/='abcde').or.(s(2)/='fghij')) call abort
+ if ((u(1)/='qwerty').or.(u(2)/='asdfgh').or.(u(3)/='zxcvbn')) call abort
+
+end program foo
