From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 574353858C2C; Thu, 30 Sep 2021 18:12:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 574353858C2C MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Harald Anlauf To: gcc-cvs@gcc.gnu.org Subject: [gcc r10-10155] Fortran: fix error recovery for invalid constructor X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: a345847f1df9e701e54ec7f87b63e6389de1a828 X-Git-Newrev: f653f612a95ab9d54e005fba7ac6bb40ec14ffb9 Message-Id: <20210930181208.574353858C2C@sourceware.org> Date: Thu, 30 Sep 2021 18:12:08 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Sep 2021 18:12:08 -0000 https://gcc.gnu.org/g:f653f612a95ab9d54e005fba7ac6bb40ec14ffb9 commit r10-10155-gf653f612a95ab9d54e005fba7ac6bb40ec14ffb9 Author: Harald Anlauf 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. (cherry picked from commit 5e2adfeed21ee584a82cdcdfa7eed41202eb67cd) 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 471523fb767..e5ce3328471 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 }