From: Mikael Morin <mikael@gcc.gnu.org>
Date: Thu, 3 Nov 2011 23:31:32 +0000 (+0000)
Subject: trans.h (struct gfc_ss): New field nested_ss.
X-Git-Tag: releases/gcc-4.7.0~2543
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d6a0e363750d2e9289ca6297db798eac74e41bb;p=thirdparty%2Fgcc.git

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

	* trans.h (struct gfc_ss): New field nested_ss.
	* trans-expr.c (gfc_advance_se_ss_chain): Update assertion.

From-SVN: r180893
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 47c4938f8e04..92be1535b9eb 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 72d35f8de894..4cfdc3e09067 100644
--- 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 53c5ce25fa4b..06088797f64f 100644
--- 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;