From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 97ACC3857C75; Sat, 13 Nov 2021 20:15:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 97ACC3857C75 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-10268] Fortran: fix simplification of array-valued parameter expressions X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: cb85933717e52f1cd91786e6bb595494629ca5c9 X-Git-Newrev: 4b99f0c90f272c5cd94af20f15b95ba702fa0aa6 Message-Id: <20211113201505.97ACC3857C75@sourceware.org> Date: Sat, 13 Nov 2021 20:15:05 +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: Sat, 13 Nov 2021 20:15:05 -0000 https://gcc.gnu.org/g:4b99f0c90f272c5cd94af20f15b95ba702fa0aa6 commit r10-10268-g4b99f0c90f272c5cd94af20f15b95ba702fa0aa6 Author: Harald Anlauf Date: Fri Nov 5 23:48:20 2021 +0100 Fortran: fix simplification of array-valued parameter expressions gcc/fortran/ChangeLog: PR fortran/102817 * expr.c (simplify_parameter_variable): Copy shape of referenced subobject when simplifying. gcc/testsuite/ChangeLog: PR fortran/102817 * gfortran.dg/pr102817.f90: New test. (cherry picked from commit bcf3728abe8488882922005166d3065fc5fdfea1) Diff: --- gcc/fortran/expr.c | 2 ++ gcc/testsuite/gfortran.dg/pr102817.f90 | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 3fb93d4ed18..9c091fe74e1 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -2126,6 +2126,8 @@ simplify_parameter_variable (gfc_expr *p, int type) if (e == NULL) return false; + gfc_free_shape (&e->shape, e->rank); + e->shape = gfc_copy_shape (p->shape, p->rank); e->rank = p->rank; if (e->ts.type == BT_CHARACTER && p->ts.u.cl) diff --git a/gcc/testsuite/gfortran.dg/pr102817.f90 b/gcc/testsuite/gfortran.dg/pr102817.f90 new file mode 100644 index 00000000000..c081a69f0ea --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr102817.f90 @@ -0,0 +1,17 @@ +! { dg-do compile } +! PR fortran/102817 - ICE in gfc_clear_shape + +program test + type t + integer :: a(1,2) = 3 + end type t + type(t), parameter :: u = t(4) + type(t), parameter :: x(1) = t(4) + integer, parameter :: p(1,2) = (x(1)%a) + integer :: z(1,2) = (x(1)%a) + integer :: y(1,2), v(1,2), w(1,2) + v = (u %a) + w = x(1)%a + y = (x(1)%a) + print *, v, w, y, z, p +end