From: Mikael Morin <mikael.morin@sfr.fr>
Date: Fri, 7 Oct 2011 19:47:07 +0000 (+0200)
Subject: trans-array.c (gfc_conv_expr_descriptor): Add out-of-the-scalarizer cobounds evaluation.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6bd0ce7b615b8ac7ccdc63458b558765847e7da9;p=gcc.git

trans-array.c (gfc_conv_expr_descriptor): Add out-of-the-scalarizer cobounds evaluation.

	* trans-array.c (gfc_conv_expr_descriptor): Add out-of-the-scalarizer
	cobounds evaluation.

From-SVN: r179683
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 8657e59f8a1..8bcaf58224c 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-07  Mikael Morin  <mikael.morin@sfr.fr>
+
+	* trans-array.c (gfc_conv_expr_descriptor): Add out-of-the-scalarizer
+	cobounds evaluation.
+
 2011-10-07  Mikael Morin  <mikael.morin@sfr.fr>
 
 	* trans-array.c (gfc_conv_ss_startstride): Support zero rank loop.
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 067fe0b7fa3..b132bf655bd 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -5994,7 +5994,21 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss)
       tree base;
 
       if (se->want_coarray)
-	codim = gfc_get_corank (expr);
+	{
+	  codim = gfc_get_corank (expr);
+	  for (n = ss->data.info.dimen; n < ss->data.info.dimen + codim - 1;
+	       n++)
+	    {
+	      gfc_conv_section_startstride (&loop, ss, n, true, false);
+	      loop.from[n] = info->start[n];
+	      loop.to[n]   = info->end[n];
+	    }
+
+	  gcc_assert (n == ss->data.info.dimen + codim - 1);
+	  evaluate_bound (&loop.pre, info->start, info->ref->u.ar.start,
+			  info->descriptor, n, true);
+	  loop.from[n] = info->start[n];
+	}
       else
 	codim = 0;