diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2022-05-12 10:39:58 +0200 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2022-05-12 10:52:07 +0200 |
| commit | ee954d940c41614c75be11b9d1de9079c37044d7 (patch) | |
| tree | 946cf65caf1ef861564b523345e05187631621ef | |
| parent | 492ea356ce4b9e40c417b3740cc298d6cc78e870 (diff) | |
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.
| -rw-r--r-- | gcc/fortran/trans-array.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/finalize_38.f90 | 1 |
2 files changed, 7 insertions, 0 deletions
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 ! |