From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by sourceware.org (Postfix) with ESMTPS id 0E4D43858D1E; Fri, 2 Sep 2022 19:46:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0E4D43858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1662147974; bh=6u1vTTpr5XJf2006fe+90G6DUm/Tg3ltSt0EFYvicX0=; h=X-UI-Sender-Class:From:To:Subject:Date; b=F+Q9u8bl2xwlR6bTNwGZpgLPzGu4wFJGViiO0ZgYnDvuiIXMkR8prTols/+lsn/4c 1z7gHWy9faofVhXQBkZhJrgzdQuSwSsu1N8LDV6v08uO7cydAfzo8jhZ4zYYgVBv9p QFfLPW9Gz/jvqU3NE6Dt6fDAQs9bIFgYyd8zGcts= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.1.151] ([79.251.1.151]) by web-mail.gmx.net (3c-app-gmx-bs46.server.lan [172.19.170.98]) (via HTTP); Fri, 2 Sep 2022 21:46:14 +0200 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: Proxy ping [PATCH] Fortran: Fix ICE with automatic reallocation [PR100245] Content-Type: multipart/mixed; boundary=rehcsed-c037bb74-beb1-4b20-82c4-5a71a89b60d0 Date: Fri, 2 Sep 2022 21:46:14 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:qqD48eNG1LHePEc5mbn7dQZt6rM/TNKvprsnQPezxPhrWxfuQmHcUwV51kXLFHZhSbsea kHOaeifVQZz675X4wWo8oZSm7dF8/iDlvbV19qjmEHQXYEZVH9txTlDkKbQmQlAz6sDYOOzFdk3W itMcRDJYfAzUWYcY8hzWDp1TLN3bRQmuYZFkhK1KiaDQ+eGSwj7gre2HA/7ttUhrsBLyojakOkYJ SeGXcWYJJ/JYCzVvE827LkEXpS9MlMKNsOUARZ4jxiV2X46c7VhascKYE7X03x27b/vbXiT8Vg0N SI= X-UI-Out-Filterresults: notjunk:1;V03:K0:fPJbEjsEAHQ=:/Z/ZfDWnvBnQ7TXfx33yju QfMrGXkOEhxb4RVmryk8Y05a5ECx3EBgV+UJMXWmFeycjQPC+ZV9BfJ3BfoDBvQiyGbEG6mCU JvzKG5oL5Abya+MC+16JwyJ2dFcJvquwwhdcuR7g0rKg3ukfCh/7yee20jQ6IEmTqI9Ig18Dz 94EbF5yKorbIG1zPRxL0DOvlzYRx70E2imTsmcqW28azZNTCFQGZ2z9bBkaaBfrq8/axzADGX CxMIxx+sII0HaSUUHVq65LS5OcNqVS8uB/eKnvdpUMVCYpVwfNRpshBY3RSHF4J6/DdSgOJOf wOIw5LajMwc7SOZCTfKl+brHVWXTUFsPr1s1T7wadLiISfIKsFwVmyFvipqFPsw2CqwtEmd7v Erxe0GydYsVEezAzKAEMkW2hlgNU1UoZzk4dbfzOpA+X/GSs4stByU6/w5zoGPA3Eq3CSbAI7 EJoYhYcLJuNajHhmdVN+1s/qnWsdd8xATqq7np2Fj9qpR1dVWpa2DHbeQ6K+OFlB5J42AsMCS nETU38MVd3nYjxIVSWhScYAJQlS0RR8oQgWUsJHX5UUilUel+Tr9ZS0NS/WmIyKNSEjaJvjGE 9u4kNXfwWWg3rRdVKcTeFvlpmHs0HCKpVsOYfHQHqeKJny91Kb/HUKB/zIs0K60QoI5YfHlwz lPq5++2ZcXjSmCIwU7uFabBbZpTRAa04w6RTrzk81GUmXZIcrYzZlDUMe6HxzNpa39AFOHOLX ehXYcGLf/+4tbT9UI7Z+fRPMhHxojY7JoLynTAE3S6fJL6kRiU+yjrKmpLxGL+V0FW5eCQebp V+3OXI/ X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --rehcsed-c037bb74-beb1-4b20-82c4-5a71a89b60d0 Content-Type: text/plain; charset=UTF-8 Dear all, Jose posted a small patch here that was never reviewed: https://gcc.gnu.org/pipermail/fortran/2021-April/055982.html IMHO the patch is fine and nearly obvious. I inquired in the PR, and Jose did not object to my handling of his patch. So - unless there are objections - I will commit the patch in the next days in the slightly corrected version as attached below (with fixed PR typo in commit message ;-). Regtested on x86_64-pc-linux-gnu. Thanks, Harald --rehcsed-c037bb74-beb1-4b20-82c4-5a71a89b60d0 Content-Type: text/x-patch Content-Disposition: attachment; filename=pr100245.diff Content-Transfer-Encoding: quoted-printable =46rom d7e5cca20be4a4ed00705f0d577302819ad97123 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Jos=3DC3=3DA9=3D20Rui=3D20Faustino=3D20de=3D20Sousa?=3D Date: Fri, 2 Sep 2022 21:35:22 +0200 Subject: [PATCH] Fortran: Fix ICE with automatic reallocation [PR100245] gcc/fortran/ChangeLog: PR fortran/100245 * trans-expr.cc (trans_class_assignment): Add if clause to handle derived type in the LHS. gcc/testsuite/ChangeLog: PR fortran/100245 * gfortran.dg/PR100245.f90: New test. =2D-- gcc/fortran/trans-expr.cc | 3 +++ gcc/testsuite/gfortran.dg/PR100245.f90 | 28 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/PR100245.f90 diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc index 850007fd2e1..13c3e7df45f 100644 =2D-- a/gcc/fortran/trans-expr.cc +++ b/gcc/fortran/trans-expr.cc @@ -11436,6 +11436,9 @@ trans_class_assignment (stmtblock_t *block, gfc_ex= pr *lhs, gfc_expr *rhs, class_han =3D GFC_CLASS_TYPE_P (TREE_TYPE (lse->expr)) ? gfc_class_data_get (lse->expr) : lse->expr; + if (!POINTER_TYPE_P (TREE_TYPE (class_han))) + class_han =3D gfc_build_addr_expr (NULL_TREE, class_han); + /* Allocate block. */ gfc_init_block (&alloc); gfc_allocate_using_malloc (&alloc, class_han, size, NULL_TREE); diff --git a/gcc/testsuite/gfortran.dg/PR100245.f90 b/gcc/testsuite/gfortr= an.dg/PR100245.f90 new file mode 100644 index 00000000000..07c1f7b3a1c =2D-- /dev/null +++ b/gcc/testsuite/gfortran.dg/PR100245.f90 @@ -0,0 +1,28 @@ +! { dg-do run } +! +! Test the fix for PR100245 +! + +program main_p + + implicit none + + type :: foo_t + integer :: a + end type foo_t + + integer, parameter :: a =3D 42 + + class(foo_t), allocatable :: val + class(foo_t), allocatable :: rs1 + type(foo_t), allocatable :: rs2 + + allocate(val, source=3Dfoo_t(42)) + if (val%a/=3Da) stop 1 + rs1 =3D val + if (rs1%a/=3Da) stop 2 + rs2 =3D val + if (rs2%a/=3Da) stop 3 + deallocate(val, rs1, rs2) + +end program main_p =2D- 2.35.3 --rehcsed-c037bb74-beb1-4b20-82c4-5a71a89b60d0--