aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorHarald Anlauf <anlauf@gmx.de>2021-09-29 20:11:53 +0200
committerHarald Anlauf <anlauf@gmx.de>2021-09-29 20:11:53 +0200
commit5e2adfeed21ee584a82cdcdfa7eed41202eb67cd (patch)
tree82d18a12bfb809e28780c9ab13875b82371fce43 /gcc
parenta672a2258256f331b658c97e2f68711b709fdbe8 (diff)
downloadgcc-5e2adfeed21ee584a82cdcdfa7eed41202eb67cd.zip
gcc-5e2adfeed21ee584a82cdcdfa7eed41202eb67cd.tar.gz
gcc-5e2adfeed21ee584a82cdcdfa7eed41202eb67cd.tar.bz2
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.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/array.c3
-rw-r--r--gcc/testsuite/gfortran.dg/pr102520.f9012
2 files changed, 15 insertions, 0 deletions
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index b858bad..a4d1cb4 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 0000000..1c98c18
--- /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 }