* trans.h (struct gfc_ss): New field nested_ss.

	* trans-expr.c (gfc_advance_se_ss_chain): Update assertion.

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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 47c4938..92be153 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,10 @@
 2011-11-03  Mikael Morin  <mikael@gcc.gnu.org>
 
+       * trans.h (struct gfc_ss): New field nested_ss.
+       * trans-expr.c (gfc_advance_se_ss_chain): Update assertion.
+
+2011-11-03  Mikael Morin  <mikael@gcc.gnu.org>
+
        * trans-array.c (set_vector_loop_bounds): Loop over the parents.
 
 2011-11-03  Mikael Morin  <mikael@gcc.gnu.org>

diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 72d35f8..4cfdc3e 100644 (file)
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -92,7 +92,8 @@ gfc_advance_se_ss_chain (gfc_se * se)
   while (p != NULL)
     {
       /* Simple consistency check.  */
-      gcc_assert (p->parent == NULL || p->parent->ss == p->ss);
+      gcc_assert (p->parent == NULL || p->parent->ss == p->ss
+                 || p->parent->ss->nested_ss == p->ss);
 
       /* If we were in a nested loop, the next scalarized expression can be
         on the parent ss' next pointer.  Thus we should not take the next

diff --git a/gcc/fortran/trans.h b/gcc/fortran/trans.h
index 53c5ce2..0608879 100644 (file)
--- a/gcc/fortran/trans.h
+++ b/gcc/fortran/trans.h
@@ -249,6 +249,11 @@ typedef struct gfc_ss
   /* Non-null if the ss is part of a nested loop.  */
   struct gfc_ss *parent;
 
+  /* If the evaluation of an expression requires a nested loop (for example
+     if the sum intrinsic is evaluated inline), this points to the nested
+     loop's gfc_ss.  */
+  struct gfc_ss *nested_ss;
+
   /* The loop this gfc_ss is in.  */
   struct gfc_loopinfo *loop;