From: mikael <mikael@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 7 Oct 2011 19:14:07 +0000 (+0000)
Subject: 	* expr.c (gfc_get_corank): Return 0 if input expression is not a
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25f989b3f1dd1e3ecf0822c305267af9f21c4ea7;p=thirdparty%2Fgcc.git

	* expr.c (gfc_get_corank): Return 0 if input expression is not a
	coarray.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@179675 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 9133321d59be..4263f19f915e 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-07  Mikael Morin  <mikael.morin@sfr.fr>
+
+	* expr.c (gfc_get_corank): Return 0 if input expression is not a
+	coarray.
+
 2011-10-07  Mikael Morin  <mikael.morin@sfr.fr>
 
 	* trans-array.c (gfc_conv_expr_descriptor): Simplify coarray
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 813a99d037b8..397dcdc470fe 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;
 }