OSDN Git Service

* trans-array.c (gfc_set_loop_bounds_from_array_spec): Loop over the
authormikael <mikael@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 3 Nov 2011 23:22:13 +0000 (23:22 +0000)
committermikael <mikael@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 3 Nov 2011 23:22:13 +0000 (23:22 +0000)
parents.

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

gcc/fortran/ChangeLog
gcc/fortran/trans-array.c

index a552bea..7595d35 100644 (file)
@@ -1,5 +1,10 @@
 2011-11-03  Mikael Morin  <mikael@gcc.gnu.org>
 
+       * trans-array.c (gfc_set_loop_bounds_from_array_spec): Loop over the
+       parents.
+
+2011-11-03  Mikael Morin  <mikael@gcc.gnu.org>
+
        * trans.h (struct gfc_ss): New field parent.
        * trans-array.c (gfc_trans_scalarizing_loops): Skip clearing if a
        parent exists.
index abff8b5..83542f6 100644 (file)
@@ -688,41 +688,54 @@ void
 gfc_set_loop_bounds_from_array_spec (gfc_interface_mapping * mapping,
                                     gfc_se * se, gfc_array_spec * as)
 {
-  int n, dim;
+  int n, dim, total_dim;
   gfc_se tmpse;
+  gfc_ss *ss;
   tree lower;
   tree upper;
   tree tmp;
 
-  if (as && as->type == AS_EXPLICIT)
-    for (n = 0; n < se->loop->dimen; n++)
-      {
-       dim = se->ss->dim[n];
-       gcc_assert (dim < as->rank);
-       gcc_assert (se->loop->dimen == as->rank);
-       if (se->loop->to[n] == NULL_TREE)
-         {
-           /* Evaluate the lower bound.  */
-           gfc_init_se (&tmpse, NULL);
-           gfc_apply_interface_mapping (mapping, &tmpse, as->lower[dim]);
-           gfc_add_block_to_block (&se->pre, &tmpse.pre);
-           gfc_add_block_to_block (&se->post, &tmpse.post);
-           lower = fold_convert (gfc_array_index_type, tmpse.expr);
-
-           /* ...and the upper bound.  */
-           gfc_init_se (&tmpse, NULL);
-           gfc_apply_interface_mapping (mapping, &tmpse, as->upper[dim]);
-           gfc_add_block_to_block (&se->pre, &tmpse.pre);
-           gfc_add_block_to_block (&se->post, &tmpse.post);
-           upper = fold_convert (gfc_array_index_type, tmpse.expr);
-
-           /* Set the upper bound of the loop to UPPER - LOWER.  */
-           tmp = fold_build2_loc (input_location, MINUS_EXPR,
-                                  gfc_array_index_type, upper, lower);
-           tmp = gfc_evaluate_now (tmp, &se->pre);
-           se->loop->to[n] = tmp;
-         }
-      }
+  total_dim = 0;
+
+  if (!as || as->type != AS_EXPLICIT)
+    return;
+
+  for (ss = se->ss; ss; ss = ss->parent)
+    {
+      total_dim += ss->loop->dimen;
+      for (n = 0; n < ss->loop->dimen; n++)
+       {
+         /* The bound is known, nothing to do.  */
+         if (ss->loop->to[n] != NULL_TREE)
+           continue;
+
+         dim = ss->dim[n];
+         gcc_assert (dim < as->rank);
+         gcc_assert (ss->loop->dimen <= as->rank);
+
+         /* Evaluate the lower bound.  */
+         gfc_init_se (&tmpse, NULL);
+         gfc_apply_interface_mapping (mapping, &tmpse, as->lower[dim]);
+         gfc_add_block_to_block (&se->pre, &tmpse.pre);
+         gfc_add_block_to_block (&se->post, &tmpse.post);
+         lower = fold_convert (gfc_array_index_type, tmpse.expr);
+
+         /* ...and the upper bound.  */
+         gfc_init_se (&tmpse, NULL);
+         gfc_apply_interface_mapping (mapping, &tmpse, as->upper[dim]);
+         gfc_add_block_to_block (&se->pre, &tmpse.pre);
+         gfc_add_block_to_block (&se->post, &tmpse.post);
+         upper = fold_convert (gfc_array_index_type, tmpse.expr);
+
+         /* Set the upper bound of the loop to UPPER - LOWER.  */
+         tmp = fold_build2_loc (input_location, MINUS_EXPR,
+                                gfc_array_index_type, upper, lower);
+         tmp = gfc_evaluate_now (tmp, &se->pre);
+         ss->loop->to[n] = tmp;
+       }
+    }
+
+  gcc_assert (total_dim == as->rank);
 }