aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/array.c
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2021-10-18 14:43:12 +0200
committerMartin Liska <mliska@suse.cz>2021-10-18 14:43:12 +0200
commit39887dd2c2c81cf3e98466827d59cafda279a258 (patch)
tree4cacd91fc1a3199b6dec319bc63cf82ffb65d813 /gcc/fortran/array.c
parente07d0e579a4e532ac4bd2d223105d73d6418868f (diff)
parent247c407c83f0015f4b92d5f71e45b63192f6757e (diff)
downloadgcc-39887dd2c2c81cf3e98466827d59cafda279a258.zip
gcc-39887dd2c2c81cf3e98466827d59cafda279a258.tar.gz
gcc-39887dd2c2c81cf3e98466827d59cafda279a258.tar.bz2
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'gcc/fortran/array.c')
-rw-r--r--gcc/fortran/array.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index b858bad..6552eaf 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -1798,6 +1798,9 @@ expand_constructor (gfc_constructor_base base)
e = c->expr;
+ if (e == NULL)
+ return false;
+
if (empty_constructor)
empty_ts = e->ts;
@@ -2578,7 +2581,7 @@ gfc_array_dimen_size (gfc_expr *array, int dimen, mpz_t *result)
}
}
- if (array->shape && array->shape[dimen])
+ if (array->shape)
{
mpz_init_set (*result, array->shape[dimen]);
return true;