aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/resolve.c
diff options
context:
space:
mode:
authorJanus Weil <janus@gcc.gnu.org>2016-11-29 15:15:29 +0100
committerJanus Weil <janus@gcc.gnu.org>2016-11-29 15:15:29 +0100
commitc0fe5a210968518a05a32c813e645f162f35201f (patch)
tree010b9714b76e403a300232fb3ea4cf571ec61534 /gcc/fortran/resolve.c
parent00738904f305a6237c2bae72b5fd7789995c4399 (diff)
downloadgcc-c0fe5a210968518a05a32c813e645f162f35201f.zip
gcc-c0fe5a210968518a05a32c813e645f162f35201f.tar.gz
gcc-c0fe5a210968518a05a32c813e645f162f35201f.tar.bz2
[multiple changes]
2016-11-29 Tobias Burnus <burnus@net-b.de> PR fortran/58175 * resolve.c (gfc_resolve_finalizers): Properly detect scalar finalizers. 2016-11-29 Janus Weil <janus@gcc.gnu.org> PR fortran/58175 * gfortran.dg/finalize_30.f90: New test case. From-SVN: r242960
Diffstat (limited to 'gcc/fortran/resolve.c')
-rw-r--r--gcc/fortran/resolve.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 9e628f1..152678f 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -12395,6 +12395,9 @@ gfc_resolve_finalizers (gfc_symbol* derived, bool *finalizable)
/* Skip this finalizer if we already resolved it. */
if (list->proc_tree)
{
+ if (list->proc_tree->n.sym->formal->sym->as == NULL
+ || list->proc_tree->n.sym->formal->sym->as->rank == 0)
+ seen_scalar = true;
prev_link = &(list->next);
continue;
}
@@ -12489,7 +12492,7 @@ gfc_resolve_finalizers (gfc_symbol* derived, bool *finalizable)
}
/* Is this the/a scalar finalizer procedure? */
- if (!arg->as || arg->as->rank == 0)
+ if (my_rank == 0)
seen_scalar = true;
/* Find the symtree for this procedure. */