From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by sourceware.org (Postfix) with ESMTPS id DACDB395B462; Sat, 24 Apr 2021 11:14:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DACDB395B462 Received: by mail-wr1-x42c.google.com with SMTP id r7so38924713wrm.1; Sat, 24 Apr 2021 04:14:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=8dH/j9z8z6itHwL/M+y+62gRsgGCCe2MpU81WgzQvms=; b=EKjx2OQE0Mbiz5IzsopuQ9PxgNZi3/Cmfy2i/Kc/syHWwf+6bqqcHcd8W6fT9QeLAC XOlCQu4c3zBNfg4yHlBdM+WWNVWH80vr/7tzK+UIKDf1PiJaLXpkVYa7IBhg4O62LCaf pIutT8aqh/LFoOFVlzMfoCgR6TYeeZMfW8zobBigJtR4Qm9LL+3kuYRBzGwrUo1uPJZF hVza4CeryrknJwgn5sxC2jUPGU8Fe3JZqToVBm1Vrf3mO4nAZwVsICj2NQv3p/49ewC0 uBvtzRebBoqWZdpQkDJfnI4MuoH8NJhO+XkFJdsacRI75xqrl4rbCofJ7u9JiFVsAfmJ Ublw== X-Gm-Message-State: AOAM531z4nFfE7HEcWTPnS8DuWaZu0R+gn1uJH7JnSGiYi1LJXvpPa6V ePvcItT10tKrCqUYh9o8/8ZQZELyLoI= X-Google-Smtp-Source: ABdhPJzo2zXS25NT+FpZ8xO7GXkPDuSVekddYc4pvs0Vu3aYJcJe0bajlQZsk9RWtbemn79kibFo0w== X-Received: by 2002:a5d:6a84:: with SMTP id s4mr10533249wru.92.1619262881767; Sat, 24 Apr 2021 04:14:41 -0700 (PDT) Received: from ?IPv6:2001:8a0:7d5c:3000:ee92:92ed:5b68:aa2f? ([2001:8a0:7d5c:3000:ee92:92ed:5b68:aa2f]) by smtp.googlemail.com with ESMTPSA id f8sm10441711wmc.8.2021.04.24.04.14.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 24 Apr 2021 04:14:41 -0700 (PDT) To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org From: =?UTF-8?Q?Jos=c3=a9_Rui_Faustino_de_Sousa?= Subject: [Patch, fortran] PR fortran/100245 - ICE on automatic reallocation Message-ID: <77feb25d-25f2-b5e6-8dac-f20d7b9fee5c@gmail.com> Date: Sat, 24 Apr 2021 11:14:40 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------7F7736D2B85BFDDD9C0F8FF6" Content-Language: en-US X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2021 11:14:46 -0000 This is a multi-part message in MIME format. --------------7F7736D2B85BFDDD9C0F8FF6 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Hi All! Proposed patch to: PR100245 - ICE on automatic reallocation. Patch tested only on x86_64-pc-linux-gnu. Add an if clause for handling derived types in the left hand side. Thank you very much. Best regards, José Rui Fortran: Fix ICE with automatic reallocation [PR100136] gcc/fortran/ChangeLog: PR fortran/100245 * trans-expr.c (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. --------------7F7736D2B85BFDDD9C0F8FF6 Content-Type: text/x-patch; charset=UTF-8; name="PR100245.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="PR100245.patch" diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 213f32b0a67..faced471918 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -10995,6 +10995,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..1fc372a0d67 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/PR100245.f90 @@ -0,0 +1,29 @@ +! { 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) + stop + +end program main_p --------------7F7736D2B85BFDDD9C0F8FF6--