From 89010691e4bf2461727c91d7cfc306feed998577 Mon Sep 17 00:00:00 2001 From: Mikael Morin Date: Fri, 7 Oct 2011 21:14:07 +0200 Subject: [PATCH] expr.c (gfc_get_corank): Return 0 if input expression is not a coarray. * expr.c (gfc_get_corank): Return 0 if input expression is not a coarray. From-SVN: r179675 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/expr.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9133321d59b..4263f19f915 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2011-10-07 Mikael Morin + + * expr.c (gfc_get_corank): Return 0 if input expression is not a + coarray. + 2011-10-07 Mikael Morin * trans-array.c (gfc_conv_expr_descriptor): Simplify coarray diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 813a99d037b..397dcdc470f 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -4301,13 +4301,19 @@ gfc_get_corank (gfc_expr *e) { int corank; gfc_ref *ref; + + if (!gfc_is_coarray (e)) + return 0; + corank = e->symtree->n.sym->as ? e->symtree->n.sym->as->corank : 0; + for (ref = e->ref; ref; ref = ref->next) { if (ref->type == REF_ARRAY) corank = ref->u.ar.as->corank; gcc_assert (ref->type != REF_SUBSTRING); } + return corank; }