diff options
| author | Martin Liska <mliska@suse.cz> | 2022-09-29 10:41:04 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-09-29 10:41:04 +0200 |
| commit | 54f3cfaf3a6f50958c71d79c85206a6c722e1a22 (patch) | |
| tree | 5f33297a30acc0df71baa0566cffa701eb97ab4e /gcc/fortran | |
| parent | 3c527a35fa428b727807c81f1225a5e0025446c1 (diff) | |
| parent | a1cd4d52d6ef90b977fb2d80c1cf17f3efa5b01d (diff) | |
| download | gcc-54f3cfaf3a6f50958c71d79c85206a6c722e1a22.zip gcc-54f3cfaf3a6f50958c71d79c85206a6c722e1a22.tar.gz gcc-54f3cfaf3a6f50958c71d79c85206a6c722e1a22.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/simplify.cc | 13 |
2 files changed, 17 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6985e62..dcbfd54 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2022-09-27 Harald Anlauf <anlauf@gmx.de> + + PR fortran/107054 + * simplify.cc (gfc_simplify_unpack): Replace assert by condition + that terminates simplification when there are not enough elements + in the constructor of argument VECTOR. + 2022-09-25 Mikael Morin <mikael@gcc.gnu.org> PR fortran/41453 diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc index c0fbd0e..6ac92cf 100644 --- a/gcc/fortran/simplify.cc +++ b/gcc/fortran/simplify.cc @@ -8458,9 +8458,16 @@ gfc_simplify_unpack (gfc_expr *vector, gfc_expr *mask, gfc_expr *field) { if (mask_ctor->expr->value.logical) { - gcc_assert (vector_ctor); - e = gfc_copy_expr (vector_ctor->expr); - vector_ctor = gfc_constructor_next (vector_ctor); + if (vector_ctor) + { + e = gfc_copy_expr (vector_ctor->expr); + vector_ctor = gfc_constructor_next (vector_ctor); + } + else + { + gfc_free_expr (result); + return NULL; + } } else if (field->expr_type == EXPR_ARRAY) e = gfc_copy_expr (field_ctor->expr); |