public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-7232] Fortran: improve error recovery on bad array section
@ 2022-02-14 20:07 Harald Anlauf
0 siblings, 0 replies; only message in thread
From: Harald Anlauf @ 2022-02-14 20:07 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:19b517dff37b8e25f6babf8883483be73cad8fb3
commit r12-7232-g19b517dff37b8e25f6babf8883483be73cad8fb3
Author: Harald Anlauf <anlauf@gmx.de>
Date: Thu Feb 10 21:22:48 2022 +0100
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.
Diff:
---
gcc/fortran/expr.cc | 8 +++++++-
gcc/testsuite/gfortran.dg/pr104211.f90 | 11 +++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/gcc/fortran/expr.cc b/gcc/fortran/expr.cc
index ed82a94022f..c9c0ba4cc2e 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 00000000000..21b0a26a17f
--- /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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-02-14 20:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-14 20:07 [gcc r12-7232] Fortran: improve error recovery on bad array section Harald Anlauf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).