diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2020-12-25 15:40:39 +0100 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gmx.de> | 2020-12-25 15:40:39 +0100 |
| commit | 6e36772ba6a8173318c173508bd3254e4140b726 (patch) | |
| tree | 7a7eac3107d3084aac349172c663baaeca699a0c /gcc/fortran/trans-expr.c | |
| parent | 4ee8e5949a9b43c05c17667dd26852f5e9d5b98b (diff) | |
| download | gcc-6e36772ba6a8173318c173508bd3254e4140b726.zip gcc-6e36772ba6a8173318c173508bd3254e4140b726.tar.gz gcc-6e36772ba6a8173318c173508bd3254e4140b726.tar.bz2 | |
PR93685 - ICE in gfc_constructor_append_expr, at fortran/constructor.c:135
Fix handling of F2018 enhancements to DATA statements that allows
initialization of pointer components to derived types, and adjust error
handling for the CHARACTER case.
gcc/fortran/ChangeLog:
* data.c (gfc_assign_data_value): Restrict use of
create_character_initializer to constant initializers.
* trans-expr.c (gfc_conv_initializer): Ensure that character
initializer is constant, otherwise fall through to get the same
error handling as for non-character cases.
gcc/testsuite/ChangeLog:
* gfortran.dg/pr93685_1.f90: New test.
* gfortran.dg/pr93685_2.f90: New test.
Diffstat (limited to 'gcc/fortran/trans-expr.c')
| -rw-r--r-- | gcc/fortran/trans-expr.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index bfe08be..f66afab 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -7877,12 +7877,14 @@ gfc_conv_initializer (gfc_expr * expr, gfc_typespec * ts, tree type, return se.expr; case BT_CHARACTER: - { - tree ctor = gfc_conv_string_init (ts->u.cl->backend_decl,expr); - TREE_STATIC (ctor) = 1; - return ctor; - } + if (expr->expr_type == EXPR_CONSTANT) + { + tree ctor = gfc_conv_string_init (ts->u.cl->backend_decl, expr); + TREE_STATIC (ctor) = 1; + return ctor; + } + /* Fallthrough. */ default: gfc_init_se (&se, NULL); gfc_conv_constant (&se, expr); |