From patchwork Thu May 12 09:23:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 53834 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 6070538438E6 for ; Thu, 12 May 2022 09:24:02 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153]) by sourceware.org (Postfix) with ESMTPS id A3060385041D; Thu, 12 May 2022 09:23:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A3060385041D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.91,219,1647331200"; d="diff'?scan'208";a="78429920" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 12 May 2022 01:23:44 -0800 IronPort-SDR: Eb9/WEQ5yRqqvfHwFpiSmXRMeDP72N/qem36Hanx9pHtuhCmKkmcpZUzunROZhPCGATpU25ODf ZC/EnIRhVaOrxyY7SQs0k0OatffQexiymAx+sbJx5u0i8voRq/+ARVKtFkJ4UVKVpZvvHzevNz J093eJgQxqXKxrGcoY0Tpd79AzlHGev2tP81MFwHnFwaG3PpFwymxkpUCTe1TDo1XuTp5O/oHS vtfG1qOo4coMvJtCI9hjN/NIOiQsz9Bvzdg1xTk26ttTwGqDl2Sv8SmO7HQBIOorRRKa0ulVzQ iVw= Message-ID: <1295021c-1f69-01b8-9d08-987c731c5711@codesourcery.com> Date: Thu, 12 May 2022 11:23:37 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: [OG11-committed] Fortran: Fix proc pointer as elemental arg handling (was: Fortran: Fix finalization resolution with deep copy (was: [Patch][Stage 1] Fortran/OpenMP: Support mapping of DT with allocatable components)) Content-Language: en-US From: Tobias Burnus To: gcc-patches , fortran , Jakub Jelinek References: <204e23b8-9d98-8ebf-d672-444ad371ed47@codesourcery.com> In-Reply-To: <204e23b8-9d98-8ebf-d672-444ad371ed47@codesourcery.com> X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-14.mgc.mentorg.com (139.181.222.14) To svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, 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 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: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Found another issue related to polymorphic deep copy (see description in the commit log). I plan to start submitting the deep-mapping patches in separate pieces to mainline later during Stage 1. Tobias ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 commit ee954d940c41614c75be11b9d1de9079c37044d7 Author: Tobias Burnus Date: Thu May 12 10:39:58 2022 +0200 Fortran: Fix proc pointer as elemental arg handling The vtab's _callback function calls the elemental 'cb' cb (var(:)%comp, comp_types_vtable._callback); which gets called in a scalarization loop as 'var' might be a nonscalar. Without the patch, that got translated as: D.1234 = &comp_types_vtable._callback ... cb (&(*D.4060)[S.3 + D.4071], &D.1234); where 'D.1234' is function_type. With the patch, it remains a pointer; i.e. D.1234 = comp... and 'cb (..., D.1234)', avoiding ME ICE. Note: Fortran (F2018, C15100) requires that dummy arguments are dummy data objects, which rules out dummy procs/proc-pointer dummies, which is enforced in resolve_fl_procedure. Thus, this change only affects the internally generated code. gcc/fortran/ChangeLog: * trans-array.c (gfc_scalar_elemental_arg_saved_as_reference): Return true for attr.proc_pointer expressions. gcc/testsuite/ChangeLog: * gfortran.dg/finalize_38.f90: Compile with -Ofast. --- gcc/fortran/trans-array.c | 6 ++++++ gcc/testsuite/gfortran.dg/finalize_38.f90 | 1 + 2 files changed, 7 insertions(+) diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 0d637162509..8e5277594ab 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -3025,6 +3025,12 @@ gfc_scalar_elemental_arg_saved_as_reference (gfc_ss_info * ss_info) && gfc_expr_is_variable (ss_info->expr)) return true; + /* Proc pointers: avoid creating a non-pointer function temporary; + should only get used internally due to constraints. */ + if (!ss_info->data.scalar.needs_temporary && + gfc_expr_attr (ss_info->expr).proc_pointer) + return true; + /* Otherwise the expression is evaluated to a temporary variable before the scalarization loop. */ return false; diff --git a/gcc/testsuite/gfortran.dg/finalize_38.f90 b/gcc/testsuite/gfortran.dg/finalize_38.f90 index 442e1753311..99c288784d6 100644 --- a/gcc/testsuite/gfortran.dg/finalize_38.f90 +++ b/gcc/testsuite/gfortran.dg/finalize_38.f90 @@ -1,4 +1,5 @@ ! { dg-do compile } +! { dg-additional-options "-Ofast" } ! ! Check finalization !