From patchwork Sun Oct 3 19:20:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 45744 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8E0563858426 for ; Sun, 3 Oct 2021 19:21:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8E0563858426 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1633288894; bh=tC7BKYev5oEHwcVd67fypUSpChHY+gD1d0YNMLwrkPo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=tfxMriMSWtVB1JQ0Mr/Z6dLCiAjEOp0YoS3hfYy7V69IQClBqzYFgPhtW4JTMH5Tu 2JLhwCzeFHkNvTnIG/LXwJObfFd9XTOQg+I1VM1cXe+99e0aKtPQRG97yCPezRUe2l IJvC3EMA8xgM/yJgfSHHFQ4gFbRk7YnyScW3FAdE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by sourceware.org (Postfix) with ESMTPS id 602C93858D3C; Sun, 3 Oct 2021 19:20:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 602C93858D3C X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.8.161] ([79.251.8.161]) by web-mail.gmx.net (3c-app-gmx-bs66.server.lan [172.19.170.210]) (via HTTP); Sun, 3 Oct 2021 21:20:46 +0200 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] PR fortran/99348, 102521 - ICEs when initializing DT parameter arrays from scalar Date: Sun, 3 Oct 2021 21:20:46 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:ELso+mBkUyMT0xZNk7dFhl4NBqqjk81ItFDE+n21lgVJbgVbPenzh6ICWP4CVAaWH2GL2 KHzF41T6+9t6M8r+n+iMkq+PBErRrwcgOHoZjXOryDSxnGsk0ux3MqFTjQDVXedIxvRQUYd7h1QK QFxfx7oyA/X8TB/BUaKRXPLcZ9t/a9JPN8AzMqGP0+1iMzyDmd7ehZSQF+1OGYxBCKOVKkQG/fRb fCAZ06C4JbsrdMt+dtaOlJ4NkKU56D1JhYvoYRyzrVr9KvqYgf0a/YMr24erfCH79JpfETF3y9v7 1s= X-UI-Out-Filterresults: notjunk:1;V03:K0:HSgkt6Gj5uo=:NpAebM9iXq50KkFLXWR6JZ A6Rq9KKfjx6Jpapyjv88ADsXr4Cubm4mr20BKpGf4n8tQPhpVpIaaVR97bR/1o6dotA6nbG3z Rpw2QMgwBPHJbaiComD7H4hLCsw24lDAq1lzAtZ2UfIYRl1nTNwLRpSl1Rkg/SRB81DMVeuXJ 19j+OJAU6YYn2CACn7P00qvvSndV0Pc2QTsr9PsI7khoL2zonU92fIs8RokbGrlbkDKRFsDSC J9fdOf10PwGAUt9CXHHccTbO6kKKsn5F/PlfbK2zLC8TUDlQUUrYX4k1lr33DcIkExPJur3Lh x16C69N+r+JqSPO6XYBi0xw5W92DlImfetlHgw9rtTMmuz+3ifzunB8k945I1UUvqlh88QAso swsnx7J280hUB8z5Z0XocyeC4/rXmKp410Zha7nVh7fXX+lGgy/pOnMOMh+vY5cA8+hIrA23z COa6oRwCAi26fhBHgItVJOTKP7lipG5wEZBN9gew09vfXkuSCAiKWgwNj1ccPsSkU+DWNHCMU 4uU6CrItpfPNeKC8NKLSINm0CakZRB9Pktl6Q8eWTmS5J/RJ19ef+/MXoWhFuY4+/ACm2oasz PtjV2HxjT35eaMM/BZY6tXBo7CgO96jF1CgjMMuga1eEA/zW9Tcdoo7BfHcRcVqEeoZO2EgdG xQ9httTG2W6Dg2f4bGU9lu1UbvvMbfGB+y2knqwseH2cRKEzLDtJdbmQyuiyisNEnrbvpxOps uXTHQPQ52OHGYhPU1KW6k2v9UATXFW7x/jFm6bIJnqOyZGzgEvq+gKbdrdNPKxqIfq0BYUV8s LvVdtfS X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Dear Fortranners, when initializing parameter arrays from scalars, we did handle only the case init->expr_type == EXPR_CONSTANT, which misses the case of derived types. As a consequence the constructor for the r.h.s. was not set up, which later led to different ICEs. To solve this I looked at gfc_simplify_spread. I was contemplating whether to also copy the logic to make this initialization dependent on -fmax-array-constructor. I chose not to, because there is no sensible and simple fallback available to handle that case while allowing the access to array elements. We could instead make that a warning. Comments / opinions? Regtested on x86_64-pc-linux-gnu. OK for mainline? As this is an ICE on valid, potentially useful code, I'd like to backport this to 11-branch. Thanks, Harald Fortran: handle initialization of derived type parameter arrays from scalar gcc/fortran/ChangeLog: PR fortran/99348 PR fortran/102521 * decl.c (add_init_expr_to_sym): Extend initialization of parameter arrays from scalars to handle derived types. gcc/testsuite/ChangeLog: PR fortran/99348 PR fortran/102521 * gfortran.dg/parameter_array_init_8.f90: New test. diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index b3c65b7175b..d6a22d13451 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -2228,12 +2228,16 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus) gfc_expr *array; int n; if (sym->attr.flavor == FL_PARAMETER - && init->expr_type == EXPR_CONSTANT - && spec_size (sym->as, &size) - && mpz_cmp_si (size, 0) > 0) + && gfc_is_constant_expr (init) + && (init->expr_type == EXPR_CONSTANT + || init->expr_type == EXPR_STRUCTURE) + && spec_size (sym->as, &size) + && mpz_cmp_si (size, 0) > 0) { array = gfc_get_array_expr (init->ts.type, init->ts.kind, &init->where); + if (init->ts.type == BT_DERIVED) + array->ts.u.derived = init->ts.u.derived; for (n = 0; n < (int)mpz_get_si (size); n++) gfc_constructor_append_expr (&array->value.constructor, n == 0 diff --git a/gcc/testsuite/gfortran.dg/parameter_array_init_8.f90 b/gcc/testsuite/gfortran.dg/parameter_array_init_8.f90 new file mode 100644 index 00000000000..05b2e424a3f --- /dev/null +++ b/gcc/testsuite/gfortran.dg/parameter_array_init_8.f90 @@ -0,0 +1,25 @@ +! { dg-do run } +! PR fortran/99348 +! PR fortran/102521 +! Check simplifications for initialization of DT paramameter arrays + +program p + type t + integer :: n + end type + type(t), parameter :: a(4) = t(1) + type(t), parameter :: d(*) = a + type(t), parameter :: b(2,2) = reshape(d, [2,2]) + integer, parameter :: nn = b(2,2)% n + type u + character(3) :: c + end type + type(u), parameter :: x(2,3) = u('ab') + type(u), parameter :: y(*,*) = transpose (x) + character(*), parameter :: c = y(3,2)% c + integer, parameter :: lc = c% len + integer, parameter :: lyc = len (y(3,2)% c) +! integer, parameter :: lxc = x(1,1)% c% len ! fails (pr101735?) + if (nn /= 1) stop 1 + if (lc /= 3 .or. lyc /= 3 .or. c /= "ab ") stop 2 +end