From 447047a8f95c6bf4b1873f390c833e91aa8af18c Mon Sep 17 00:00:00 2001
From: Harald Anlauf <anlauf@gmx.de>
Date: Tue, 1 Feb 2022 21:36:42 +0100
Subject: [PATCH] Fortran: error recovery when simplifying EOSHIFT
gcc/fortran/ChangeLog:
PR fortran/104331
* simplify.cc (gfc_simplify_eoshift): Avoid NULL pointer
dereference when shape is not set.
gcc/testsuite/ChangeLog:
PR fortran/104331
* gfortran.dg/eoshift_9.f90: New test.
---
gcc/fortran/simplify.cc | 3 +++
gcc/testsuite/gfortran.dg/eoshift_9.f90 | 8 ++++++++
2 files changed, 11 insertions(+)
create mode 100644 gcc/testsuite/gfortran.dg/eoshift_9.f90
@@ -2572,6 +2572,9 @@ gfc_simplify_eoshift (gfc_expr *array, gfc_expr *shift, gfc_expr *boundary,
if (arraysize == 0)
goto final;
+ if (array->shape == NULL)
+ goto final;
+
arrayvec = XCNEWVEC (gfc_expr *, arraysize);
array_ctor = gfc_constructor_first (array->value.constructor);
for (i = 0; i < arraysize; i++)
new file mode 100644
@@ -0,0 +1,8 @@
+! { dg-do compile }
+! PR fortran/104331 - ICE in gfc_simplify_eoshift
+! Contributed by G.Steinmetz
+
+program p
+ character(3), parameter :: a(:) = ['123'] ! { dg-error "deferred shape" }
+ character(3), parameter :: b(*) = eoshift(a, 1)
+end
--
2.34.1