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/data.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/data.c')
| -rw-r--r-- | gcc/fortran/data.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c index 3e52a57..76ddd9d 100644 --- a/gcc/fortran/data.c +++ b/gcc/fortran/data.c @@ -546,12 +546,11 @@ gfc_assign_data_value (gfc_expr *lvalue, gfc_expr *rvalue, mpz_t index, return false; } - if (ref || last_ts->type == BT_CHARACTER) + if (ref || (last_ts->type == BT_CHARACTER + && rvalue->expr_type == EXPR_CONSTANT)) { /* An initializer has to be constant. */ - if (rvalue->expr_type != EXPR_CONSTANT - || (lvalue->ts.u.cl->length == NULL - && !(ref && ref->u.ss.length != NULL))) + if (lvalue->ts.u.cl->length == NULL && !(ref && ref->u.ss.length != NULL)) return false; expr = create_character_initializer (init, last_ts, ref, rvalue); } |