diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2022-02-10 21:22:48 +0100 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gmx.de> | 2022-02-14 20:31:14 +0100 |
| commit | 19b517dff37b8e25f6babf8883483be73cad8fb3 (patch) | |
| tree | 53aff7107a574ac64a34a2079e5a03d42a83948d /gcc | |
| parent | 3d50dede07de0923f0f320d385162e546445e640 (diff) | |
| download | gcc-19b517dff37b8e25f6babf8883483be73cad8fb3.zip gcc-19b517dff37b8e25f6babf8883483be73cad8fb3.tar.gz gcc-19b517dff37b8e25f6babf8883483be73cad8fb3.tar.bz2 | |
Fortran: improve error recovery on bad array section
gcc/fortran/ChangeLog:
PR fortran/104211
* expr.cc (find_array_section): Replace assertion by error
recovery when encountering bad array constructor.
gcc/testsuite/ChangeLog:
PR fortran/104211
* gfortran.dg/pr104211.f90: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/expr.cc | 8 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr104211.f90 | 11 |
2 files changed, 18 insertions, 1 deletions
diff --git a/gcc/fortran/expr.cc b/gcc/fortran/expr.cc index ed82a94..c9c0ba4 100644 --- a/gcc/fortran/expr.cc +++ b/gcc/fortran/expr.cc @@ -1718,7 +1718,13 @@ find_array_section (gfc_expr *expr, gfc_ref *ref) } cons = gfc_constructor_lookup (base, limit); - gcc_assert (cons); + if (cons == NULL) + { + gfc_error ("Error in array constructor referenced at %L", + &ref->u.ar.where); + t = false; + goto cleanup; + } gfc_constructor_append_expr (&expr->value.constructor, gfc_copy_expr (cons->expr), NULL); } diff --git a/gcc/testsuite/gfortran.dg/pr104211.f90 b/gcc/testsuite/gfortran.dg/pr104211.f90 new file mode 100644 index 0000000..21b0a26 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr104211.f90 @@ -0,0 +1,11 @@ +! { dg-do compile } +! PR fortran/104211 - ICE in find_array_section +! Contributed by G.Steinmetz + +program p + type t + real :: n + end type + type(t), parameter :: a(3) = [t(2)] ! { dg-error "Different shape" } + type(t), parameter :: b(2) = a(2:3) ! { dg-error "Error in array constructor" } +end |