trans-array.c (gfc_add_loop_ss_code): Skip non-nestedmost ss.

	* trans-array.c (gfc_add_loop_ss_code): Skip non-nestedmost ss.
	Call recursively gfc_add_loop_ss_code for all the nested loops.
	(gfc_conv_ss_startstride): Only get the descriptor for the outermost
	ss. Call recursively gfc_conv_ss_startstride for all the nested loops.
	(set_loop_bounds): Call recursively for all the nested loops.
	(set_delta): Ditto.

From-SVN: r180898

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a8d38424326d0c9db2c04acc4f600d0201309b18..653b262b81d5c8b7a1c399c1e5c3015e6984f663 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-03  Mikael Morin  <mikael@gcc.gnu.org>
+
+       * trans-array.c (gfc_add_loop_ss_code): Skip non-nestedmost ss.
+       Call recursively gfc_add_loop_ss_code for all the nested loops.
+       (gfc_conv_ss_startstride): Only get the descriptor for the outermost
+       ss. Call recursively gfc_conv_ss_startstride for all the nested loops.
+       (set_loop_bounds): Call recursively for all the nested loops.
+       (set_delta): Ditto.
+
 2011-11-03  Mikael Morin  <mikael@gcc.gnu.org>
 
        * trans.h (struct gfc_loopinfo): New fields nested and next.

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 0c1dc895d0d4eac8870803526d3823a237b9186a..27356a1a1d33afed8dc8f0339beb8a4f1ab4824d 100644 (file)
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -2295,10 +2295,12 @@ static void
 gfc_add_loop_ss_code (gfc_loopinfo * loop, gfc_ss * ss, bool subscript,
                      locus * where)
 {
+  gfc_loopinfo *nested_loop;
   gfc_se se;
   gfc_ss_info *ss_info;
   gfc_array_info *info;
   gfc_expr *expr;
+  bool skip_nested = false;
   int n;
 
   /* TODO: This can generate bad code if there are ordering dependencies,
@@ -2309,6 +2311,10 @@ gfc_add_loop_ss_code (gfc_loopinfo * loop, gfc_ss * ss, bool subscript,
     {
       gcc_assert (ss);
 
+      /* Cross loop arrays are handled from within the most nested loop.  */
+      if (ss->nested_ss != NULL)
+       continue;
+
       ss_info = ss->info;
       expr = ss_info->expr;
       info = &ss_info->data.array;
@@ -2355,7 +2361,12 @@ gfc_add_loop_ss_code (gfc_loopinfo * loop, gfc_ss * ss, bool subscript,
          /* Add the expressions for scalar and vector subscripts.  */
          for (n = 0; n < GFC_MAX_DIMENSIONS; n++)
            if (info->subscript[n])
-             gfc_add_loop_ss_code (loop, info->subscript[n], true, where);
+             {
+               gfc_add_loop_ss_code (loop, info->subscript[n], true, where);
+               /* The recursive call will have taken care of the nested loops.
+                  No need to do it twice.  */
+               skip_nested = true;
+             }
 
          set_vector_loop_bounds (ss);
          break;
@@ -2410,6 +2421,11 @@ gfc_add_loop_ss_code (gfc_loopinfo * loop, gfc_ss * ss, bool subscript,
          gcc_unreachable ();
        }
     }
+
+  if (!skip_nested)
+    for (nested_loop = loop->nested; nested_loop;
+        nested_loop = nested_loop->next)
+      gfc_add_loop_ss_code (nested_loop, nested_loop->ss, subscript, where);
 }
 
 
@@ -3495,8 +3511,10 @@ done:
       switch (ss_info->type)
        {
        case GFC_SS_SECTION:
-         /* Get the descriptor for the array.  */
-         gfc_conv_ss_descriptor (&loop->pre, ss, !loop->array_parameter);
+         /* Get the descriptor for the array.  If it is a cross loops array,
+            we got the descriptor already in the outermost loop.  */
+         if (ss->parent == NULL)
+           gfc_conv_ss_descriptor (&loop->pre, ss, !loop->array_parameter);
 
          for (n = 0; n < ss->dimen; n++)
            gfc_conv_section_startstride (loop, ss, ss->dim[n]);
@@ -3785,6 +3803,9 @@ done:
       tmp = gfc_finish_block (&block);
       gfc_add_expr_to_block (&loop->pre, tmp);
     }
+
+  for (loop = loop->nested; loop; loop = loop->next)
+    gfc_conv_ss_startstride (loop);
 }
 
 /* Return true if both symbols could refer to the same data object.  Does
@@ -4246,6 +4267,9 @@ set_loop_bounds (gfc_loopinfo *loop)
        }
     }
   mpz_clear (i);
+
+  for (loop = loop->nested; loop; loop = loop->next)
+    set_loop_bounds (loop);
 }
 
 
@@ -4356,6 +4380,9 @@ set_delta (gfc_loopinfo *loop)
            }
        }
     }
+
+  for (loop = loop->nested; loop; loop = loop->next)
+    set_delta (loop);
 }