diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2022-09-27 20:54:28 +0200 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gmx.de> | 2022-09-27 21:39:40 +0200 |
| commit | 78bc6497fc61bbdacfb416ee0246a775360d9af6 (patch) | |
| tree | 543d926b6e3888e66f28c45c42d4b28df06137f0 | |
| parent | e73d9fcafbd07bc3714fbaf8a82db71d50015c92 (diff) | |
| download | gcc-78bc6497fc61bbdacfb416ee0246a775360d9af6.zip gcc-78bc6497fc61bbdacfb416ee0246a775360d9af6.tar.gz gcc-78bc6497fc61bbdacfb416ee0246a775360d9af6.tar.bz2 | |
Fortran: error recovery while simplifying intrinsic UNPACK [PR107054]
gcc/fortran/ChangeLog:
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.
gcc/testsuite/ChangeLog:
PR fortran/107054
* gfortran.dg/pr107054.f90: New test.
| -rw-r--r-- | gcc/fortran/simplify.cc | 13 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr107054.f90 | 13 |
2 files changed, 23 insertions, 3 deletions
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); diff --git a/gcc/testsuite/gfortran.dg/pr107054.f90 b/gcc/testsuite/gfortran.dg/pr107054.f90 new file mode 100644 index 0000000..bbfe646 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr107054.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } +! PR fortran/107054 - ICE in gfc_simplify_unpack +! Contributed by G.Steinmetz + +program p + type t + integer :: n = 0 + end type + type(t), parameter :: a(4) = t(2) + type(t), parameter :: b(4) = reshape(a,[2]) ! { dg-error "Different shape" } + type(t), parameter :: c(2) = pack(b,[.false.,.true.,.false.,.true.]) ! { dg-error "Different shape" } + type(t), parameter :: d(4) = unpack(c,[.false.,.true.,.false.,.true.],a) +end |