public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-3967] Fortran: fix error recovery for invalid constructor
@ 2021-09-29 18:12 Harald Anlauf
0 siblings, 0 replies; only message in thread
From: Harald Anlauf @ 2021-09-29 18:12 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:5e2adfeed21ee584a82cdcdfa7eed41202eb67cd
commit r12-3967-g5e2adfeed21ee584a82cdcdfa7eed41202eb67cd
Author: Harald Anlauf <anlauf@gmx.de>
Date: Wed Sep 29 20:11:53 2021 +0200
Fortran: fix error recovery for invalid constructor
gcc/fortran/ChangeLog:
PR fortran/102520
* array.c (expand_constructor): Do not dereference NULL pointer.
gcc/testsuite/ChangeLog:
PR fortran/102520
* gfortran.dg/pr102520.f90: New test.
Diff:
---
gcc/fortran/array.c | 3 +++
gcc/testsuite/gfortran.dg/pr102520.f90 | 12 ++++++++++++
2 files changed, 15 insertions(+)
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index b858bada18a..a4d1cb4c72d 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;
diff --git a/gcc/testsuite/gfortran.dg/pr102520.f90 b/gcc/testsuite/gfortran.dg/pr102520.f90
new file mode 100644
index 00000000000..1c98c185c17
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr102520.f90
@@ -0,0 +1,12 @@
+! { dg-do compile }
+! PR fortran/102520 - ICE in expand_constructor, at fortran/array.c:1802
+
+program p
+ type t
+ end type
+ type(t), parameter :: a(4) = shape(1) ! { dg-error "Incompatible" }
+ type(t), parameter :: b(2,2) = reshape(a,[2,2]) ! { dg-error "Incompatible" }
+ type(t), parameter :: c(2,2) = transpose(b) ! { dg-error "Unclassifiable" }
+end
+
+! { dg-error "Different shape for array assignment" " " { target *-*-* } 7 }
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-09-29 18:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-29 18:12 [gcc r12-3967] Fortran: fix error recovery for invalid constructor 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).