From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 563813854145; Thu, 29 Sep 2022 18:39:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 563813854145 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664476786; bh=DIhF3AzSQoGrQY5xRCltAD1lYcB2kZKeMrE5sDf6PfA=; h=From:To:Subject:Date:From; b=jlBCvLcFtJHItrAO8Fytq/ou4TQ+w3VGe3ROK6/KxZZA8XhCVLjOiw3IuYC2jHCAT sFenTkqtWa8G8+HtMINbG87D5ULdOlw1Lh5syXudMgMNCnmX6vRbyf0dkIgt6ztX1n KY/E6GJrgGxBbFnCdS9Z0HiZkp5yEc4jEy2g4eGM= 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 r12-8798] Fortran: error recovery while simplifying intrinsic UNPACK [PR107054] X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 22c2658a8b6ae9ece8b33bc483c04a767168b5f4 X-Git-Newrev: 2773a90c0f4f323e8ace0593893bc8fcbd2266cf Message-Id: <20220929183946.563813854145@sourceware.org> Date: Thu, 29 Sep 2022 18:39:46 +0000 (GMT) List-Id: https://gcc.gnu.org/g:2773a90c0f4f323e8ace0593893bc8fcbd2266cf commit r12-8798-g2773a90c0f4f323e8ace0593893bc8fcbd2266cf Author: Harald Anlauf Date: Tue Sep 27 20:54:28 2022 +0200 Fortran: error recovery while simplifying intrinsic UNPACK [PR107054] gcc/fortran/ChangeLog: PR fortran/107054 * simplify.cc (gfc_simplify_unpack): Replace assert by condition that terminates simplification when there are not enough elements in the constructor of argument VECTOR. gcc/testsuite/ChangeLog: PR fortran/107054 * gfortran.dg/pr107054.f90: New test. (cherry picked from commit 78bc6497fc61bbdacfb416ee0246a775360d9af6) Diff: --- gcc/fortran/simplify.cc | 13 ++++++++++--- gcc/testsuite/gfortran.dg/pr107054.f90 | 13 +++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc index a6a3e94fbd9..d48ae1af584 100644 --- a/gcc/fortran/simplify.cc +++ b/gcc/fortran/simplify.cc @@ -8420,9 +8420,16 @@ gfc_simplify_unpack (gfc_expr *vector, gfc_expr *mask, gfc_expr *field) { if (mask_ctor->expr->value.logical) { - gcc_assert (vector_ctor); - e = gfc_copy_expr (vector_ctor->expr); - vector_ctor = gfc_constructor_next (vector_ctor); + if (vector_ctor) + { + e = gfc_copy_expr (vector_ctor->expr); + vector_ctor = gfc_constructor_next (vector_ctor); + } + else + { + gfc_free_expr (result); + return NULL; + } } else if (field->expr_type == EXPR_ARRAY) e = gfc_copy_expr (field_ctor->expr); diff --git a/gcc/testsuite/gfortran.dg/pr107054.f90 b/gcc/testsuite/gfortran.dg/pr107054.f90 new file mode 100644 index 00000000000..bbfe646beba --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr107054.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } +! PR fortran/107054 - ICE in gfc_simplify_unpack +! Contributed by G.Steinmetz + +program p + type t + integer :: n = 0 + end type + type(t), parameter :: a(4) = t(2) + type(t), parameter :: b(4) = reshape(a,[2]) ! { dg-error "Different shape" } + type(t), parameter :: c(2) = pack(b,[.false.,.true.,.false.,.true.]) ! { dg-error "Different shape" } + type(t), parameter :: d(4) = unpack(c,[.false.,.true.,.false.,.true.],a) +end