OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Steven G. Kargl 2015-10-30 16:26:59 +00:00
parent e3316e3caa
commit dc0f176a1c
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/fortran/ChangeLog
View File

@ -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.

11
gcc/fortran/decl.c
View File

@ -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);

5
gcc/testsuite/ChangeLog
View File

@ -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.

9
gcc/testsuite/gfortran.dg/pr68154.f90 Normal file
View File

@ -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