resolve.c (compare_spec_to_ref): Move coarray ref initialization code...

	* resolve.c (compare_spec_to_ref): Move coarray ref initialization
	code...
	(resolve_array_ref): ... here.

From-SVN: r179672

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d1a90144918e435c081230e54640d7eeaa777e28..4c0888f237f963ac476b27fd58a3356dacd14169 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-07  Mikael Morin  <mikael.morin@sfr.fr>
+
+       * resolve.c (compare_spec_to_ref): Move coarray ref initialization
+       code...
+       (resolve_array_ref): ... here.
+
 2011-10-07  Mikael Morin  <mikael.morin@sfr.fr>
 
        * check.c (is_coarray): Remove.

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 84db3ddb019f0aa46d970f26b095dc21de788176..e6770db07ab090d8de47d1b80bdd36e2c2dd48fa 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -4396,14 +4396,6 @@ compare_spec_to_ref (gfc_array_ref *ar)
          return FAILURE;
       }
 
-  if (as->corank && ar->codimen == 0)
-    {
-      int n;
-      ar->codimen = as->corank;
-      for (n = ar->dimen; n < ar->dimen + ar->codimen; n++)
-       ar->dimen_type[n] = DIMEN_THIS_IMAGE;
-    }
-
   return SUCCESS;
 }
 
@@ -4672,6 +4664,14 @@ resolve_array_ref (gfc_array_ref *ar)
   if (!ar->as->cray_pointee && compare_spec_to_ref (ar) == FAILURE)
     return FAILURE;
 
+  if (ar->as->corank && ar->codimen == 0)
+    {
+      int n;
+      ar->codimen = ar->as->corank;
+      for (n = ar->dimen; n < ar->dimen + ar->codimen; n++)
+       ar->dimen_type[n] = DIMEN_THIS_IMAGE;
+    }
+
   return SUCCESS;
 }