diff mbox series

[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))

Message ID 1295021c-1f69-01b8-9d08-987c731c5711@codesourcery.com
State Committed
Headers
Series [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)) |

Commit Message

Tobias Burnus May 12, 2022, 9:23 a.m. UTC 
  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
diff mbox series

Patch

commit ee954d940c41614c75be11b9d1de9079c37044d7
Author: Tobias Burnus <tobias@codesourcery.com>
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
 !