diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2021-09-27 14:04:54 +0200 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2021-09-27 14:04:54 +0200 |
| commit | 00f6de9c69119594f7dad3bd525937c94c8200d0 (patch) | |
| tree | 5133e52eac80818ae2e4b4180af6e462af8b3571 /libgfortran | |
| parent | 76773d3fea4daaaf5b0f6d79d9f48ffe6b3c97fd (diff) | |
| download | gcc-00f6de9c69119594f7dad3bd525937c94c8200d0.tar.gz | |
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.
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/intrinsics/size.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libgfortran/intrinsics/size.c b/libgfortran/intrinsics/size.c index e9d93861eff..f1a60ba7209 100644 --- a/libgfortran/intrinsics/size.c +++ b/libgfortran/intrinsics/size.c @@ -25,6 +25,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "libgfortran.h" +/* Note: This function is only used internally in libgfortran and old FE code, + new code generates the code inline. */ index_type size0 (const array_t * array) { @@ -47,6 +49,8 @@ iexport(size0); extern index_type size1 (const array_t * array, index_type dim); export_proto(size1); +/* Note: This function it is unused in libgfortran itself and the FE no longer + call it; however, old code might still call it. */ index_type size1 (const array_t * array, index_type dim) { |