diff options
| author | Martin Liska <mliska@suse.cz> | 2022-10-15 15:32:39 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-10-15 15:32:39 +0200 |
| commit | 2c92cfe87d2bb8aa0eb78f3932fca16699cb35c9 (patch) | |
| tree | b118381a0a883a762ddd56c0e91608d937ee8bdf /gcc/fortran | |
| parent | bd21c04269deded2c7476ceca1100a26f28ea526 (diff) | |
| parent | baeec7cc83b19b46d1c73523f06efa7ea2b30390 (diff) | |
| download | gcc-2c92cfe87d2bb8aa0eb78f3932fca16699cb35c9.zip gcc-2c92cfe87d2bb8aa0eb78f3932fca16699cb35c9.tar.gz gcc-2c92cfe87d2bb8aa0eb78f3932fca16699cb35c9.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/resolve.cc | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index fa03b33..8b80242 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2022-10-14 Harald Anlauf <anlauf@gmx.de> + + PR fortran/100971 + * resolve.cc (resolve_transfer): Extend check for permissibility + of polymorphic elements in a data transfer to arrays. + 2022-10-12 Harald Anlauf <anlauf@gmx.de> PR fortran/107217 diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index d133bc2..9202e2f 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -10017,6 +10017,7 @@ resolve_transfer (gfc_code *code) if (exp == NULL || (exp->expr_type != EXPR_VARIABLE && exp->expr_type != EXPR_FUNCTION + && exp->expr_type != EXPR_ARRAY && exp->expr_type != EXPR_STRUCTURE)) return; @@ -10030,6 +10031,7 @@ resolve_transfer (gfc_code *code) const gfc_typespec *ts = exp->expr_type == EXPR_STRUCTURE || exp->expr_type == EXPR_FUNCTION + || exp->expr_type == EXPR_ARRAY ? &exp->ts : &exp->symtree->n.sym->ts; /* Go to actual component transferred. */ @@ -10128,6 +10130,9 @@ resolve_transfer (gfc_code *code) if (exp->expr_type == EXPR_STRUCTURE) return; + if (exp->expr_type == EXPR_ARRAY) + return; + sym = exp->symtree->n.sym; if (sym->as != NULL && sym->as->type == AS_ASSUMED_SIZE && exp->ref |