From patchwork Mon Feb 21 21:55:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1595749 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=BXRMVaN2; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K2bjc14J6z9sGC for ; Tue, 22 Feb 2022 08:56:34 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0C6AC385F01B for ; Mon, 21 Feb 2022 21:56:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0C6AC385F01B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1645480591; bh=+ie7uXvA1iZYNUE4Tyo7wyxWPcrwreME6UbhtCiISi8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=BXRMVaN20sqDbkahtLoVU8rzFGoKf4DC2pFkjfLJDkzaK3O+UqronctKkTOMDIVmb eqeVBIEQXkmH61ydMBwK4zwJF/a7ixSizu7kA9ijpJSe+fhwNYXG2i1wqk2LA98DlY mhre1Mzf1nrVvReJcyCT4fZi9hzYzoDHzWJ3S6V8= 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.17.20]) by sourceware.org (Postfix) with ESMTPS id 3C0D53858C2C; Mon, 21 Feb 2022 21:55:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3C0D53858C2C X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [93.207.80.210] ([93.207.80.210]) by web-mail.gmx.net (3c-app-gmx-bs09.server.lan [172.19.170.60]) (via HTTP); Mon, 21 Feb 2022 22:55:51 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] PR fortran/104619 - [10/11/12 Regression] ICE on list comprehension with default derived type constructor Date: Mon, 21 Feb 2022 22:55:51 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:uRzGBRT09Gx1uufKzWcVapnFGWb5zYfdkCE/ioA+QHFCXRGbr4Vc0gr7umv9Tw7c9138l bbUipd5jFDP7Nt/69AkKve3d09UJneOTay4atGSW15N4x9RB76Q7gZTxaT+F+hO7hp4i12fWJzT1 Stg83v6VgRvYYpP1UpOTZLP3GyR3JLi7LrY7KjcCNdVWiO9PAwaEHw9KurcnJfx/fdg/2RUTpwwM UwfRZbv2/7Svv9Xm12R7J6FgtlOrQOH2M9/YkMs3qqTdlNll+CdXNttpWl1nckIdDmcfJfb59FMx vA= X-UI-Out-Filterresults: notjunk:1;V03:K0:Z4sIYoQObcw=:/6cn11fNWlR4TZuqQE2VsO vHFr2+y4ENqD6hWdnOBLErkc5pTZfwUPSXGP25I4uHz0+AujHBCnPF+M1sZRj1gwzRBwM7N6G /9v8NoNWPTnEtNwsaSdnNVupo3jbpOSB4FxdYMXnYtB9dvbdNJCOCuBToyXLNv8jLad6SaeQ5 UyFtz4TrZABPqLKC06aG/wR5doUOul/JkjV7XWVGrK16lO1oa+KOTloA+Xtz/NShEh10Tewpq kLSsiY+ImcSnoQV3vQ+Wz+TyhJWEri/+N0uf1H4ABC999xNRJ19PSeLFxoXj5KdrwmXym/Hdg ZCMVBMBtPy2q0eVWlxSM+QoC0w7VHWbWPChrN0Jw2VQvx4RQln2Pn9RwbEMmyyTg98wZs0/rd QHIxj5oOxZUYHJMiSBsFShxn98j2gUx3S9U1rts4Jt4EZfMHlaQbq46rKTgP0TLOqXPHJiLov edS0yHS1jJVfx7Ks0R0NnM+z4BVdK3/93BzuqIbwLGBZgT9/f7hsOqsy8Z/UDDSD2kywTyfBK T19TgZqPcRf7GyHxDHxqY3/+/I1ZtUPuaULTpEX+u7MOoFw529ftwbjukCigIQAqMK7UCnvbP 1yGBHfhayN2QBMaEOFmMGf7QhoB9MXstKMToRvWA9uP77ldO+eSvG2SLKO2OJtl26Hil9+zat JprsU17hHEQkKzRKuGAySa59gXogQ2vxwdNBK/pBB0YXTyWxvONEMdsR2kwCG8396EzaOMgUg XxvenvQ2HBp4iK0i9sTrtkKuI7VgzItHqmU9c/meJsfphFueMfAyp/SgpUAzWz5AnX+B2b6yT IA/4jGk X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Dear Fortranners, a recently introduced shape validation for an array constructor against the declared shape of a DT component failed to punt if the shape of the constructor cannot be determined at compile time. Suggested solution: skip the shape check in those cases. Regtested on x86_64-pc-linux-gnu. OK for mainline / affected branches? Thanks, Harald From 356d1ab6ddb58559d3641f169f44fd24f7cb00d1 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Mon, 21 Feb 2022 22:49:05 +0100 Subject: [PATCH] Fortran: skip compile-time shape check if constructor shape is not known gcc/fortran/ChangeLog: PR fortran/104619 * resolve.cc (resolve_structure_cons): Skip shape check if shape of constructor cannot be determined at compile time. gcc/testsuite/ChangeLog: PR fortran/104619 * gfortran.dg/derived_constructor_comps_7.f90: New test. --- gcc/fortran/resolve.cc | 2 ++ .../derived_constructor_comps_7.f90 | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/derived_constructor_comps_7.f90 diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index 266e41e25b1..451bc97df43 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -1472,6 +1472,8 @@ resolve_structure_cons (gfc_expr *expr, int init) t = false; break; }; + if (cons->expr->shape == NULL) + continue; mpz_set_ui (len, 1); mpz_add (len, len, comp->as->upper[n]->value.integer); mpz_sub (len, len, comp->as->lower[n]->value.integer); diff --git a/gcc/testsuite/gfortran.dg/derived_constructor_comps_7.f90 b/gcc/testsuite/gfortran.dg/derived_constructor_comps_7.f90 new file mode 100644 index 00000000000..238ac3d9f26 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/derived_constructor_comps_7.f90 @@ -0,0 +1,28 @@ +! { dg-do run } +! PR fortran/104619 + +module m + implicit none + type :: item + real :: x + end type item + type :: container + type(item) :: items(3) + end type container +end module + +program p + use m + implicit none + type(item), allocatable :: items(:) + type(container) :: c + integer :: i, n + items = [item(3.0), item(4.0), item(5.0)] + c = container(items=[(items(i), i = 1, size(items))]) + if (any (c%items% x /= items% x)) stop 1 + n = size (items) + c = container(items=[(items(i), i = 1, n)]) + if (any (c%items% x /= items% x)) stop 2 + c = container(items=[(items(i), i = 1, 3)]) + if (any (c%items% x /= items% x)) stop 3 +end program -- 2.34.1