]> git.ipfire.org Git - thirdparty/gcc.git/commit
Fortran: Fix assumed-size to assumed-rank passing [PR94070]
authorTobias Burnus <tobias@codesourcery.com>
Mon, 27 Sep 2021 12:04:54 +0000 (14:04 +0200)
committerTobias Burnus <tobias@codesourcery.com>
Mon, 27 Sep 2021 12:04:54 +0000 (14:04 +0200)
commit00f6de9c69119594f7dad3bd525937c94c8200d0
tree5133e52eac80818ae2e4b4180af6e462af8b3571
parent76773d3fea4daaaf5b0f6d79d9f48ffe6b3c97fd
Fortran: Fix assumed-size to assumed-rank passing [PR94070]

This code inlines the size0 and size1 libgfortran calls, the former is still
used by libgfortan itself (and by old code). Besides permitting more
optimizations, it also permits to handle assumed-rank dummies better: If the
dummy argument is a nonpointer/nonallocatable, an assumed-size actual arg is
repesented by having ubound == -1 for the last dimension. However, for
allocatable/pointers, this value can also exist. Hence, the dummy arg attr
has to be honored.

For that reason, when calling an assumed-rank procedure with nonpointer,
nonallocatable dummy arguments, the bounds have to be updated to avoid
the case ubound == -1 for the last dimension.

PR fortran/94070

gcc/fortran/ChangeLog:

* trans-array.c (gfc_tree_array_size): New function to
find size inline (whole array or one dimension).
(array_parameter_size): Use it, take stmt_block as arg.
(gfc_conv_array_parameter): Update call.
* trans-array.h (gfc_tree_array_size): Add prototype.
* trans-decl.c (gfor_fndecl_size0, gfor_fndecl_size1): Remove
these global vars.
(gfc_build_intrinsic_function_decls): Remove their initialization.
* trans-expr.c (gfc_conv_procedure_call): Update
bounds of pointer/allocatable actual args to nonallocatable/nonpointer
dummies to be one based.
* trans-intrinsic.c (gfc_conv_intrinsic_shape): Fix case for
assumed rank with allocatable/pointer dummy.
(gfc_conv_intrinsic_size): Update to use inline function.
* trans.h (gfor_fndecl_size0, gfor_fndecl_size1): Remove var decl.

libgfortran/ChangeLog:

* intrinsics/size.c (size0, size1): Comment that now not
used by newer compiler code.

libgomp/ChangeLog:

* testsuite/libgomp.oacc-fortran/privatized-ref-2.f90: Update
expected dg-note output.

gcc/testsuite/ChangeLog:

* gfortran.dg/c-interop/cf-out-descriptor-6.f90: Remove xfail.
* gfortran.dg/c-interop/size.f90: Remove xfail.
* gfortran.dg/intrinsic_size_3.f90: Update scan-tree-dump-times.
* gfortran.dg/transpose_optimization_2.f90: Likewise.
* gfortran.dg/size_optional_dim_1.f90: Add scan-tree-dump-not.
* gfortran.dg/assumed_rank_22.f90: New test.
* gfortran.dg/assumed_rank_22_aux.c: New test.
15 files changed:
gcc/fortran/trans-array.c
gcc/fortran/trans-array.h
gcc/fortran/trans-decl.c
gcc/fortran/trans-expr.c
gcc/fortran/trans-intrinsic.c
gcc/fortran/trans.h
gcc/testsuite/gfortran.dg/assumed_rank_22.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/assumed_rank_22_aux.c [new file with mode: 0644]
gcc/testsuite/gfortran.dg/c-interop/cf-out-descriptor-6.f90
gcc/testsuite/gfortran.dg/c-interop/size.f90
gcc/testsuite/gfortran.dg/intrinsic_size_3.f90
gcc/testsuite/gfortran.dg/size_optional_dim_1.f90
gcc/testsuite/gfortran.dg/transpose_optimization_2.f90
libgfortran/intrinsics/size.c
libgomp/testsuite/libgomp.oacc-fortran/privatized-ref-2.f90