diff options
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 85d2091..e342723 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -5199,12 +5199,7 @@ check_host_association (gfc_expr *e) { /* Clear the shape, since it might not be valid. */ if (e->shape != NULL) - { - for (n = 0; n < e->rank; n++) - mpz_clear (e->shape[n]); - - free (e->shape); - } + gfc_free_shape (&e->shape, e->rank); /* Give the expression the right symtree! */ gfc_find_sym_tree (e->symtree->name, NULL, 1, &st); @@ -6559,10 +6554,13 @@ gfc_expr_to_initialize (gfc_expr *e) for (i = 0; i < ref->u.ar.dimen; i++) ref->u.ar.start[i] = ref->u.ar.end[i] = ref->u.ar.stride[i] = NULL; - result->rank = ref->u.ar.dimen; break; } + gfc_free_shape (&result->shape, result->rank); + + /* Recalculate rank, shape, etc. */ + gfc_resolve_expr (result); return result; } @@ -8429,11 +8427,8 @@ ignore: result = SUCCESS; over: - for (i--; i >= 0; i--) - { - mpz_clear (shape[i]); - mpz_clear (shape2[i]); - } + gfc_clear_shape (shape, i); + gfc_clear_shape (shape2, i); return result; } |