[PATCH v2 0/7] fortran: Ignore unused arguments for scalarisation [PR97896]

Mikael Morin mikael@gcc.gnu.org
Thu Aug 5 16:26:07 GMT 2021


Hello,

This is the second submit of a patch series whose first version[1] was not
welcome because of its C++ usage.

After some thought I figured out that rewriting the series without C++
features would not be that impacting after all.
So here you go, the (not so) good old-fashioned way.

The problematic case is intrinsic procedures where an argument is actually not used in the code generated (KIND argument of INDEX in the testcase), which confuses the scalariser.

Thomas König comitted a change to workaround the problem, but it regressed in PR97896.  These patch put the workaround where I think it is more appropriate, namely at the beginning of the scalarisation procedure.  This is the patch 7 of the series, preceded with the revert in patch 6.  I intend to commit both of them squashed together.

The rest of the series (patches 1-5) is preliminary work to be able to identify the KIND argument of the INDEX intrinsic by its name, rather than using the right number of next->next->next indirections starting with the first argument.  It is probably overkill for just this use case, but I think it’s worth having that facility in the long term.

I intend to submit a separate patch for the release branch with only patch 6 and 7 and the next->next->next indirections.

Regression-tested on x86_64-linux-gnu.  Ok for master? 


[1] https://gcc.gnu.org/pipermail/fortran/2021-August/056303.html

Mikael Morin (7):
  fortran: new wrapper class gfc_dummy_arg
  fortran: Tiny sort_actual internal refactoring
  fortran: Reverse actual vs dummy argument mapping
  fortran: simplify elemental arguments walking
  fortran: Delete redundant missing_arg_type field
  Revert "Remove KIND argument from INDEX so it does not mess up
    scalarization."
  fortran: Ignore unused args in scalarization [PR97896]

 gcc/fortran/gfortran.h                |  41 +++++++++--
 gcc/fortran/interface.c               |  77 ++++++++++++++++++--
 gcc/fortran/intrinsic.c               | 101 +++++++++++---------------
 gcc/fortran/intrinsic.h               |   3 +-
 gcc/fortran/iresolve.c                |  21 +-----
 gcc/fortran/trans-array.c             |  74 ++++++++++++++-----
 gcc/fortran/trans-array.h             |   5 +-
 gcc/fortran/trans-decl.c              |  24 +-----
 gcc/fortran/trans-expr.c              |   9 ++-
 gcc/fortran/trans-intrinsic.c         |   3 +-
 gcc/fortran/trans-stmt.c              |  30 ++++----
 gcc/fortran/trans.h                   |   4 +-
 gcc/testsuite/gfortran.dg/index_5.f90 |  23 ++++++
 13 files changed, 262 insertions(+), 153 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/index_5.f90

-- 
2.30.2



More information about the Fortran mailing list