From: Mikael Morin <mikael.morin@sfr.fr>
Date: Fri, 7 Oct 2011 19:07:04 +0000 (+0200)
Subject: resolve.c (compare_spec_to_ref): Move coarray ref initialization code...
X-Git-Tag: releases/gcc-4.7.0~3293
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b78a06b2243643c6c35f19e6c376502e3fb0f07f;p=thirdparty%2Fgcc.git

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 d1a90144918e..4c0888f237f9 100644
--- 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 84db3ddb019f..e6770db07ab0 100644
--- 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;
 }