aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/resolve.c
diff options
context:
space:
mode:
authorPaul Thomas <pault@gcc.gnu.org>2021-01-25 10:27:51 +0000
committerPaul Thomas <pault@gcc.gnu.org>2021-01-25 10:27:51 +0000
commitc6b0e33febbf73abfcc2bb0e28f0b62afe3b0f2a (patch)
tree938d3c78385f2c7ad4d7deb04a28cbb03855e18c /gcc/fortran/resolve.c
parent28229916e1b131ad5d17a73603f65229e0a92f58 (diff)
downloadgcc-c6b0e33febbf73abfcc2bb0e28f0b62afe3b0f2a.zip
gcc-c6b0e33febbf73abfcc2bb0e28f0b62afe3b0f2a.tar.gz
gcc-c6b0e33febbf73abfcc2bb0e28f0b62afe3b0f2a.tar.bz2
Fortran: Fix deferred character lengths in array constructors [PR98517].
2021-01-25 Steve Kargl <kargl@gcc.gnu.org> gcc/fortran PR fortran/98517 * resolve.c (resolve_charlen): Check that length expression is present before testing for scalar/integer.. gcc/testsuite/ PR fortran/98517 * gfortran.dg/charlen_18.f90 : New test.
Diffstat (limited to 'gcc/fortran/resolve.c')
-rw-r--r--gcc/fortran/resolve.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index c075d0f..11b5dbc 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -12446,7 +12446,8 @@ resolve_charlen (gfc_charlen *cl)
}
/* cl->length has been resolved. It should have an integer type. */
- if (cl->length->ts.type != BT_INTEGER || cl->length->rank != 0)
+ if (cl->length
+ && (cl->length->ts.type != BT_INTEGER || cl->length->rank != 0))
{
gfc_error ("Scalar INTEGER expression expected at %L",
&cl->length->where);