diff options
Diffstat (limited to 'gcc/fortran/trans-expr.c')
| -rw-r--r-- | gcc/fortran/trans-expr.c | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 47a844d..5c62234 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -1381,7 +1381,7 @@ gfc_conv_structure (gfc_se * se, gfc_expr * expr, int init) tree type; 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); head = build1 (CONSTRUCTOR, type, 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. */ if (init) { - if (cm->dimension) + if (!cm->pointer) { - arraytype = TREE_TYPE (cm->backend_decl); - cse.expr = gfc_conv_array_initializer (arraytype, c->expr); + /* Initializing a non-pointer element. */ + 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 - 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 { |