mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-05 23:01:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR fortran/15969 (ICE and assertion failure in trans-expr.c)

Browse Source 
PR fortran/15969
* trans-expr.c (gfc_conv_structure): Handle initialization
of scalar pointer components.

From-SVN: r84464
This commit is contained in:
Tobias Schlüter 2004-07-10 19:30:40 +02:00 committed by Tobias Schlüter
parent 794ba78be2
commit 104b260cac
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/fortran/ChangeLog
View File

@ -6,6 +6,10 @@
PR fortran/16336 PR fortran/16336
* match.c (match_common): Fix error reporting for used common. * match.c (match_common): Fix error reporting for used common.
PR fortran/15969
* trans-expr.c (gfc_conv_structure): Handle initialization
of scalar pointer components.
2004-07-10 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> 2004-07-10 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de>
* trans-common.c: Fix whitespace issues, make variable names * trans-common.c: Fix whitespace issues, make variable names

31
gcc/fortran/trans-expr.c
View File

@ -1381,7 +1381,7 @@ gfc_conv_structure (gfc_se * se, gfc_expr * expr, int init)
tree type; tree type;
tree arraytype; tree arraytype;
assert (expr->expr_type == EXPR_STRUCTURE); assert (expr->expr_type == EXPR_STRUCTURE || expr->expr_type == EXPR_NULL);
type = gfc_typenode_for_spec (&expr->ts); type = gfc_typenode_for_spec (&expr->ts);
head = build1 (CONSTRUCTOR, type, NULL_TREE); head = build1 (CONSTRUCTOR, type, NULL_TREE);
tail = NULL_TREE; tail = NULL_TREE;
@ -1397,15 +1397,32 @@ gfc_conv_structure (gfc_se * se, gfc_expr * expr, int init)
/* Evaluate the expression for this component. */ /* Evaluate the expression for this component. */
if (init) if (init)
{ {
if (cm->dimension) if (!cm->pointer)
{ {
arraytype = TREE_TYPE (cm->backend_decl); /* Initializing a non-pointer element. */
cse.expr = gfc_conv_array_initializer (arraytype, c->expr); if (cm->dimension)
{
arraytype = TREE_TYPE (cm->backend_decl);
cse.expr = gfc_conv_array_initializer (arraytype, c->expr);
}
else if (cm->ts.type == BT_DERIVED)
gfc_conv_structure (&cse, c->expr, 1);
else
gfc_conv_expr (&cse, c->expr);
} }
else if (cm->ts.type == BT_DERIVED)
gfc_conv_structure (&cse, c->expr, 1);
else else
gfc_conv_expr (&cse, c->expr); {
/* Pointer components may only be initialized to
NULL. This should have been enforced by the frontend. */
if (cm->dimension)
{
gfc_todo_error ("Initialization of pointer members");
}
else
cse.expr = fold_convert (TREE_TYPE (cm->backend_decl),
null_pointer_node);
}
} }
else else
{ {