From d357d991136f44feee3c05ae8940ea3b241698fd Mon Sep 17 00:00:00 2001 From: Mikael Morin Date: Thu, 2 Aug 2012 19:10:38 +0000 Subject: [PATCH] iresolve.c (resolve_bound, [...]): Don't set the shape for assumed rank arrays. * iresolve.c (resolve_bound, gfc_resolve_shape): Don't set the shape for assumed rank arrays. * simplify.c (gfc_simplify_shape): Don't try to simplify if the argument is assumed rank. From-SVN: r190094 --- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/iresolve.c | 17 ++++++++++++----- gcc/fortran/simplify.c | 3 +++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 979f28cb985..94bb958aa5f 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2012-08-02 Mikael Morin + + * iresolve.c (resolve_bound, gfc_resolve_shape): + Don't set the shape for assumed rank arrays. + * simplify.c (gfc_simplify_shape): Don't try to simplify if the + argument is assumed rank. + 2012-08-02 Mikael Morin * array.c (gfc_copy_array_ref): Don't copy the offset field. diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index 6d1e8b2a176..3f981d88c1b 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -134,9 +134,12 @@ resolve_bound (gfc_expr *f, gfc_expr *array, gfc_expr *dim, gfc_expr *kind, if (dim == NULL) { f->rank = 1; - f->shape = gfc_get_shape (1); - mpz_init_set_ui (f->shape[0], coarray ? gfc_get_corank (array) - : array->rank); + if (array->rank != -1) + { + f->shape = gfc_get_shape (1); + mpz_init_set_ui (f->shape[0], coarray ? gfc_get_corank (array) + : array->rank); + } } f->value.function.name = xstrdup (name); @@ -2225,8 +2228,12 @@ gfc_resolve_shape (gfc_expr *f, gfc_expr *array, gfc_expr *kind) f->ts.kind = gfc_default_integer_kind; f->rank = 1; - f->shape = gfc_get_shape (1); - mpz_init_set_ui (f->shape[0], array->rank); + if (array->rank != -1) + { + f->shape = gfc_get_shape (1); + mpz_init_set_ui (f->shape[0], array->rank); + } + f->value.function.name = gfc_get_string (PREFIX ("shape_%d"), f->ts.kind); } diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index c12675ee4df..e4ccddf967c 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -5470,6 +5470,9 @@ gfc_simplify_shape (gfc_expr *source, gfc_expr *kind) gfc_try t; int k = get_kind (BT_INTEGER, kind, "SHAPE", gfc_default_integer_kind); + if (source->rank == -1) + return NULL; + result = gfc_get_array_expr (BT_INTEGER, k, &source->where); if (source->rank == 0)