procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR fortran/15314 (ICE caused by array initializer in derived type definition)

Browse source 
PR fortran/15314
	* trans-expr.c (gfc_conv_structure): Use field type, not expr type.

From-SVN: r81816
This commit is contained in:
Paul Brook 2004-05-13 23:11:47 +00:00 • committed by Paul Brook
parent 15342341aa
commit 979837429d
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/fortran/ChangeLog
View file

@ -1,3 +1,8 @@
2004-05-13 Paul Brook <paul@codesourcery.com>
PR fortran/15314
* trans-expr.c (gfc_conv_structure): Use field type, not expr type.
2004-05-13 Joseph S. Myers <jsm@polyomino.org.uk>
* gfortran.texi: Use @table @emph instead of @itemize @emph.

15
gcc/fortran/trans-expr.c
View file

@ -1292,20 +1292,15 @@ gfc_conv_structure (gfc_se * se, gfc_expr * expr, int init)
/* Evaluate the expression for this component. */
if (init)
{
switch (c->expr->expr_type)
if (cm->dimension)
{
case EXPR_ARRAY:
arraytype = TREE_TYPE (cm->backend_decl);
cse.expr = gfc_conv_array_initializer (arraytype, c->expr);
break;
case EXPR_STRUCTURE:
gfc_conv_structure (&cse, c->expr, 1);
break;
default:
gfc_conv_expr (&cse, c->expr);
}
else if (cm->ts.type == BT_DERIVED)
gfc_conv_structure (&cse, c->expr, 1);
else
gfc_conv_expr (&cse, c->expr);
}
else
{