diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2020-08-02 10:57:59 +0100 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2020-08-02 10:57:59 +0100 |
| commit | a5baf71b0a5bd79923c095cf81218b8194008f60 (patch) | |
| tree | b93da317db4de0f951a9c88c99087c8ec9da8301 /gcc/fortran/interface.c | |
| parent | 6912619fce0dafde2269960c4704e8f88c61b8f3 (diff) | |
| download | gcc-a5baf71b0a5bd79923c095cf81218b8194008f60.zip gcc-a5baf71b0a5bd79923c095cf81218b8194008f60.tar.gz gcc-a5baf71b0a5bd79923c095cf81218b8194008f60.tar.bz2 | |
This patch fixes PR96320. See the explanatory comment in the testcase.
2020-08-01 Paul Thomas <pault@gcc.gnu.org>
gcc/fortran
PR target/96320
* interface.c (gfc_check_dummy_characteristics): If a module
procedure arrives with assumed shape in the interface and
deferred shape in the procedure itself, update the latter and
copy the lower bounds.
gcc/testsuite/
PR target/96320
* gfortran.dg/module_procedure_4.f90 : New test.
Diffstat (limited to 'gcc/fortran/interface.c')
| -rw-r--r-- | gcc/fortran/interface.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index e518209..7985fc7 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -1466,6 +1466,19 @@ gfc_check_dummy_characteristics (gfc_symbol *s1, gfc_symbol *s2, int i, compval; gfc_expr *shape1, *shape2; + /* Sometimes the ambiguity between deferred shape and assumed shape + does not get resolved in module procedures, where the only explicit + declaration of the dummy is in the interface. */ + if (s1->ns->proc_name && s1->ns->proc_name->attr.module_procedure + && s1->as->type == AS_ASSUMED_SHAPE + && s2->as->type == AS_DEFERRED) + { + s2->as->type = AS_ASSUMED_SHAPE; + for (i = 0; i < s2->as->rank; i++) + if (s1->as->lower[i] != NULL) + s2->as->lower[i] = gfc_copy_expr (s1->as->lower[i]); + } + if (s1->as->type != s2->as->type) { snprintf (errmsg, err_len, "Shape mismatch in argument '%s'", @@ -2617,7 +2630,7 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual, || (actual->rank == 0 && formal->attr.dimension && gfc_is_coindexed (actual))) { - if (where + if (where && (!formal->attr.artificial || (!formal->maybe_array && !maybe_dummy_array_arg (actual)))) { @@ -2708,7 +2721,7 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual, if (ref == NULL && actual->expr_type != EXPR_NULL) { - if (where + if (where && (!formal->attr.artificial || (!formal->maybe_array && !maybe_dummy_array_arg (actual)))) { @@ -3965,7 +3978,7 @@ gfc_procedure_use (gfc_symbol *sym, gfc_actual_arglist **ap, locus *where) if (!gfc_compare_actual_formal (ap, dummy_args, 0, sym->attr.elemental, sym->attr.proc == PROC_ST_FUNCTION, where)) return false; - + if (!check_intents (dummy_args, *ap)) return false; |