https://gcc.gnu.org/g:2fa5c4bc10dfd4e9235c2e12c23c39aa3a1e364f
commit 2fa5c4bc10dfd4e9235c2e12c23c39aa3a1e364f
Author: Tobias Burnus <tob...@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.cc (gfc_scalar_elemental_arg_saved_as_reference):
Return true for attr.proc_pointer expressions.
gcc/testsuite/ChangeLog:
* gfortran.dg/finalize_38b.f90: Compile with -Ofast.
Diff:
---
gcc/fortran/ChangeLog.omp | 5 +++++
gcc/fortran/trans-array.cc | 6 ++++++
gcc/testsuite/ChangeLog.omp | 4 ++++
gcc/testsuite/gfortran.dg/finalize_38b.f90 | 1 +
4 files changed, 16 insertions(+)
diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp
index 9a702e5ecb1..c5e1dfd959e 100644
--- a/gcc/fortran/ChangeLog.omp
+++ b/gcc/fortran/ChangeLog.omp
@@ -1,3 +1,8 @@
+2022-05-12 Tobias Burnus <tob...@codesourcery.com>
+
+ * trans-array.cc (gfc_scalar_elemental_arg_saved_as_reference):
+ Return true for attr.proc_pointer expressions.
+
2022-04-27 Tobias Burnus <tob...@codesourcery.com>
* resolve.cc (gfc_resolve_finalizers): Remove
diff --git a/gcc/fortran/trans-array.cc b/gcc/fortran/trans-array.cc
index 1a9495448f3..0dcef85c563 100644
--- a/gcc/fortran/trans-array.cc
+++ b/gcc/fortran/trans-array.cc
@@ -3113,6 +3113,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/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 89603da68c0..39d3b8401ae 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,7 @@
+2022-05-12 Tobias Burnus <tob...@codesourcery.com>
+
+ * gfortran.dg/finalize_38b.f90: Compile with -Ofast.
+
2022-04-27 Tobias Burnus <tob...@codesourcery.com>
* gfortran.dg/abstract_type_6.f03: Remove dg-error as
diff --git a/gcc/testsuite/gfortran.dg/finalize_38b.f90
b/gcc/testsuite/gfortran.dg/finalize_38b.f90
index 442e1753311..99c288784d6 100644
--- a/gcc/testsuite/gfortran.dg/finalize_38b.f90
+++ b/gcc/testsuite/gfortran.dg/finalize_38b.f90
@@ -1,4 +1,5 @@
! { dg-do compile }
+! { dg-additional-options "-Ofast" }
!
! Check finalization
!
