From patchwork Fri Dec 9 21:27:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 61737 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 5251D384DD9E for ; Fri, 9 Dec 2022 21:28:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5251D384DD9E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670621289; bh=BVTmZ7MV9jnjBcGq2qFRB7MMtPdl69dgB9mAUKal+2Y=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=fF3ZhVXqTFmt4yVE4zQ/M7LmKdRCtoAmV5p2WTKGbcSW+rxRJT+v7oFGCCE1vmWrt NABbJFDZQ+KgiQRucBeugbtyiRoox0zfhrtr7SHiNHbg8KFn1FT4SqpWi7exgrAvSn 2pjTIUcxSh/IFuKucDrC8TyGO2rFUx/8g2KDZUCw= 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 40F843856B60; Fri, 9 Dec 2022 21:27:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 40F843856B60 X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.90.18] ([93.207.90.18]) by web-mail.gmx.net (3c-app-gmx-bs62.server.lan [172.19.170.146]) (via HTTP); Fri, 9 Dec 2022 22:27:15 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] Fortran: ICE on recursive derived types with allocatable components [PR107872] Date: Fri, 9 Dec 2022 22:27:15 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:EfeS4ktOcula93DQ57TB5jjxZymyUQ/t0DSPtC6TojRNl6IhbVqhB8mjbO15Ru8xY1Jf3 b8Sh90Ao+KzUawrG/DYmjSHJQBC8vlbnCZbrCOoPcLpEEgKLm9UphU7QnB0W6Bm9SclMDAk+xpuh /GBNa4rZbJYd17ogzf+vWHQlx/bMQbmOxWlPUyEG1UvHvpHVmkJoPsstORjWw+DGXDb/bjks+3zW 0R/JW2o+0ExNYJOIvwXvCfragZo+3mcwspaSQMtGQp64huf3jUQFfaPxr5L9oDaNo4E58tFAnksv Sc= UI-OutboundReport: notjunk:1;M01:P0:CvPmTJRvzK0=;XO3QGoydoRG6KgkHWH6EP7Qx5ma DFCXJzdUEX/S5vZefAuN4QJlWLIySd/LVrn9I7f44Xb53r7jmJWaVlHdWNuhl/ZuA6P8S0cQu 3lrpjfMjWe8LS0tsxx1HJNIjfIV9+3BE3x+pZt/QcCe4laIq4eyUzKceDZWt5JkgaCoKPbiuy LlQJM4zMQuYAdwx1ki3dRVPGtoQvs9fiowX84OGZJlIKcUVXGBatZ0hkfMzr3MqVJ6RHY3ebN p0MltQ2lV18nIss8WCRH5uXmE5zQ6y4/b4kCIIAODDjvW2UkZiIJCMSW5enNN5VDFn9RZWynQ fXdOrFP/Ja3RNdx0lkdYlPM/Wx155+S3zFuEK84RIrPZ1ijVApBjzn9P3EGvP+TFqmpDxTPMd UXOjsNtZNCCmfubhfvJDSurbEnT+N7OZC7KB38eWRlbcD4FSJBMuV2rCNBZfnOe9Rto854P6a JdodEASC8kfn9PzMFCbaMWIKMFcDNyqNU3SAzaZIyJtI/+m6ddomVByAWfftoQa93IqOo+MrU Fkcxb79uJ0jiLmW1f8+ErKtJgBpMnBldP79AAgAV3sgscXOYTlEtm8IIFF4p1yU1YFrpKkHFZ aFcwETpyCMofcbqSHq7lP3AKVrw9AiltaUTKSMcbG3++VwOLLBehIg8Gq85/c4lKSGzoZ6+Cl XtrunomO6vhYEasts80uVWb74aQ7PLmdhf0BiO8nIn+cL9uTEeG6VVMhRxD6YfmqKpyBdb+aB mNyK88bamzXESfLhj/EZbMSjg2Q8PzUpGk5+kwfuMtGuEggdzq4qse2Y8FNIIxnPEMDHZ2mQB BW/hbp8ehCJTri8FeV9xpBIg== X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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 all, I am submitting the attached simple - and obvious - patch on behalf of Paul. It prevents a resource exhaustion due to an infinite loop, and has been regtested by multiple contributers, ;-) at least on x86_64-pc-linux-gnu. I intend to commit it to mainline within 24 hours, unless there are further comments. Thanks, Harald From 01254aa2eb766c7584fd047568d7277d4d65d067 Mon Sep 17 00:00:00 2001 From: Paul Thomas Date: Fri, 9 Dec 2022 22:13:45 +0100 Subject: [PATCH] Fortran: ICE on recursive derived types with allocatable components [PR107872] gcc/fortran/ChangeLog: PR fortran/107872 * resolve.cc (derived_inaccessible): Skip over allocatable components to prevent an infinite loop. gcc/testsuite/ChangeLog: PR fortran/107872 * gfortran.dg/pr107872.f90: New test. --- gcc/fortran/resolve.cc | 3 +- gcc/testsuite/gfortran.dg/pr107872.f90 | 40 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/pr107872.f90 diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index 75dc4b59105..158bf08ec26 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -7536,7 +7536,8 @@ derived_inaccessible (gfc_symbol *sym) for (c = sym->components; c; c = c->next) { /* Prevent an infinite loop through this function. */ - if (c->ts.type == BT_DERIVED && c->attr.pointer + if (c->ts.type == BT_DERIVED + && (c->attr.pointer || c->attr.allocatable) && sym == c->ts.u.derived) continue; diff --git a/gcc/testsuite/gfortran.dg/pr107872.f90 b/gcc/testsuite/gfortran.dg/pr107872.f90 new file mode 100644 index 00000000000..09838479e92 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr107872.f90 @@ -0,0 +1,40 @@ +! { dg-do run } +! +! Test the fix for PR107872, where an ICE occurred in +! resolve.cc(derived_inaccessible) because derived types with +! recursive allocatable components were not catered for. +! +module mod1 + type t + integer :: data + type(t), allocatable :: next + contains + procedure, private :: write_t + generic :: write(formatted) => write_t + end type +contains + recursive subroutine write_t(this, unit, iotype, v_list, iostat, iomsg) + class(t), intent(in) :: this + integer, intent(in) :: unit + character(*), intent(in) :: iotype + integer, intent(in) :: v_list(:) + integer, intent(out) :: iostat + character(*), intent(inout) :: iomsg + if (ALLOCATED(this%next)) & + write (unit, '(dt)') this%next + write (unit, '(i2)') this%data + end subroutine +end module + + use mod1 + type(t) :: a + character (8) :: buffer + a%data = 1 + allocate (a%next) + a%next%data = 2 + allocate (a%next%next) + a%next%next%data = 3 + write (buffer, '(dt)')a + deallocate (a%next) + if (trim (buffer) .ne. ' 3 2 1') stop 1 +end -- 2.35.3