aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorHarald Anlauf <anlauf@gmx.de>2022-08-23 22:16:14 +0200
committerHarald Anlauf <anlauf@gmx.de>2022-08-24 18:24:41 +0200
commit55d8c5409325001c89c35c3d04d425dec9127146 (patch)
tree064ef2a11211b6b21ecfa9fd58b2f0f2e3cabe38 /gcc
parent530f80451a9e76896a0294e0f4bd59baff1ac27f (diff)
downloadgcc-55d8c5409325001c89c35c3d04d425dec9127146.zip
gcc-55d8c5409325001c89c35c3d04d425dec9127146.tar.gz
gcc-55d8c5409325001c89c35c3d04d425dec9127146.tar.bz2
Fortran: improve error recovery while simplifying size of bad array [PR103694]
gcc/fortran/ChangeLog: PR fortran/103694 * simplify.cc (simplify_size): The size expression of an array cannot be simplified if an error occurs while resolving the array spec. gcc/testsuite/ChangeLog: PR fortran/103694 * gfortran.dg/pr103694.f90: New test.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/simplify.cc5
-rw-r--r--gcc/testsuite/gfortran.dg/pr103694.f9011
2 files changed, 14 insertions, 2 deletions
diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc
index f992c31..bc178d5 100644
--- a/gcc/fortran/simplify.cc
+++ b/gcc/fortran/simplify.cc
@@ -7536,8 +7536,9 @@ simplify_size (gfc_expr *array, gfc_expr *dim, int k)
}
for (ref = array->ref; ref; ref = ref->next)
- if (ref->type == REF_ARRAY && ref->u.ar.as)
- gfc_resolve_array_spec (ref->u.ar.as, 0);
+ if (ref->type == REF_ARRAY && ref->u.ar.as
+ && !gfc_resolve_array_spec (ref->u.ar.as, 0))
+ return NULL;
if (dim == NULL)
{
diff --git a/gcc/testsuite/gfortran.dg/pr103694.f90 b/gcc/testsuite/gfortran.dg/pr103694.f90
new file mode 100644
index 0000000..3ed8b20
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr103694.f90
@@ -0,0 +1,11 @@
+! { dg-do compile }
+! PR fortran/103694 - ICE in gfc_conv_expr_op
+! Contributed by G.Steinmetz
+
+subroutine s
+ type t
+ integer :: a(2)
+ end type
+ type(t) :: x((0.)/0)
+ integer :: n = size(x(1)%a) ! { dg-error "does not reduce to a constant expression" }
+end