Hello,

I have had these patches fixing PR97896 almost ready for a while.  Now is time 
to actually submit them, at last.

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.
These patches use some c++ features, namely class inheritance and virtual 
functions; I know this is frowned upon by some (fortran) maintainers; let’s see 
what they will say.

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? 

Mikael Morin (7):
  fortran: new abstract 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                |  45 +++++---
 gcc/fortran/interface.c               |  14 +--
 gcc/fortran/intrinsic.c               | 152 +++++++++++++-------------
 gcc/fortran/intrinsic.h               |   3 +-
 gcc/fortran/iresolve.c                |  21 +---
 gcc/fortran/resolve.c                 |  10 +-
 gcc/fortran/symbol.c                  |  19 ++++
 gcc/fortran/trans-array.c             |  75 ++++++++++---
 gcc/fortran/trans-array.h             |   5 +-
 gcc/fortran/trans-decl.c              |  24 +---
 gcc/fortran/trans-expr.c              |   7 +-
 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 ++++
 15 files changed, 252 insertions(+), 183 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/index_5.f90

-- 
2.30.2

Reply via email to