From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 8ECC338155AB; Fri, 16 Sep 2022 19:06:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8ECC338155AB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663355191; bh=g5DxhyI1nuK8qyKrICHkM6O9MOUgrGJ3eOBlZFdm9dI=; h=From:To:Subject:Date:From; b=BGI4pSef+q+shY3Do61tMIpME3S9QYkqObc1ZhGR/R2EvybOT4OPLY+ipEaC4FjRC 3fIq0MfeMGcyBwMvhHbJRvMuEhjnt5EMC0e5mAkpv1mOw0mJhrQROFvbVTXtx2tV8f 7GdILIsdtFu9tkvSUEfldMJv/Ek3zfzETlq8pZck= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Harald Anlauf To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-8768] Fortran: Fix ICE with automatic reallocation [PR100245] X-Act-Checkin: gcc X-Git-Author: =?utf-8?q?Jos=C3=A9_Rui_Faustino_de_Sousa?= X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 05cfd7b0677502d06a50ea6ff05d4445e194e3b9 X-Git-Newrev: 9035eaaf028ca609660f1f55c0d9f22fb7d3b797 Message-Id: <20220916190631.8ECC338155AB@sourceware.org> Date: Fri, 16 Sep 2022 19:06:31 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9035eaaf028ca609660f1f55c0d9f22fb7d3b797 commit r12-8768-g9035eaaf028ca609660f1f55c0d9f22fb7d3b797 Author: José Rui Faustino de Sousa Date: Fri Sep 2 21:35:22 2022 +0200 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. (cherry picked from commit 504424f33771be0405454e7845219d5df1bb88bb) Diff: --- gcc/fortran/trans-expr.cc | 3 +++ gcc/testsuite/gfortran.dg/PR100245.f90 | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc index e35ea2fc790..7895d034610 100644 --- a/gcc/fortran/trans-expr.cc +++ b/gcc/fortran/trans-expr.cc @@ -11435,6 +11435,9 @@ trans_class_assignment (stmtblock_t *block, gfc_expr *lhs, gfc_expr *rhs, class_han = 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 = 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/gfortran.dg/PR100245.f90 new file mode 100644 index 00000000000..07c1f7b3a1c --- /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 = 42 + + class(foo_t), allocatable :: val + class(foo_t), allocatable :: rs1 + type(foo_t), allocatable :: rs2 + + allocate(val, source=foo_t(42)) + if (val%a/=a) stop 1 + rs1 = val + if (rs1%a/=a) stop 2 + rs2 = val + if (rs2%a/=a) stop 3 + deallocate(val, rs1, rs2) + +end program main_p