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

[pf3gnuchains/gcc-fork.git] / gcc / fortran / trans.h

diff --git a/gcc/fortran/trans.h b/gcc/fortran/trans.h
index 6f9f6c8..53c5ce2 100644 (file)
--- a/gcc/fortran/trans.h
+++ b/gcc/fortran/trans.h
@@ -113,7 +113,8 @@ gfc_coarray_type;
 
 typedef struct gfc_array_info
 {
 
 typedef struct gfc_array_info
 {

-  int dimen;
+  mpz_t *shape;
+

   /* The ref that holds information on this section.  */
   gfc_ref *ref;
   /* The descriptor of this array.  */
   /* The ref that holds information on this section.  */
   gfc_ref *ref;
   /* The descriptor of this array.  */


@@ -134,10 +135,6 @@ typedef struct gfc_array_info
   tree end[GFC_MAX_DIMENSIONS];
   tree stride[GFC_MAX_DIMENSIONS];
   tree delta[GFC_MAX_DIMENSIONS];
   tree end[GFC_MAX_DIMENSIONS];
   tree stride[GFC_MAX_DIMENSIONS];
   tree delta[GFC_MAX_DIMENSIONS];

-
-  /* Translation from loop dimensions to actual dimensions.
-     actual_dim = dim[loop_dim]  */
-  int dim[GFC_MAX_DIMENSIONS];

 }
 gfc_array_info;
 
 }
 gfc_array_info;
 


@@ -186,53 +183,76 @@ typedef enum
 gfc_ss_type;
 
 
 gfc_ss_type;
 
 

-/* Scalarization State chain.  Created by walking an expression tree before
-   creating the scalarization loops.  Then passed as part of a gfc_se structure
-   to translate the expression inside the loop.  Note that these chains are
-   terminated by gfc_ss_terminator, not NULL.  A NULL pointer in a gfc_se
-   indicates to gfc_conv_* that this is a scalar expression.
-   SS structures can only belong to a single loopinfo.  They must be added
-   otherwise they will not get freed.  */
-
-typedef struct gfc_ss
+typedef struct gfc_ss_info

 {
 {

+  int refcount;

   gfc_ss_type type;
   gfc_expr *expr;
   gfc_ss_type type;
   gfc_expr *expr;

-  mpz_t *shape;

   tree string_length;
   tree string_length;

+

   union
   {
     /* If type is GFC_SS_SCALAR or GFC_SS_REFERENCE.  */
     struct
     {
   union
   {
     /* If type is GFC_SS_SCALAR or GFC_SS_REFERENCE.  */
     struct
     {

-      tree expr;
+      tree value;

     }
     scalar;
 
     /* GFC_SS_TEMP.  */
     struct
     {
     }
     scalar;
 
     /* GFC_SS_TEMP.  */
     struct
     {

-      /* The rank of the temporary.  May be less than the rank of the
-         assigned expression.  */
-      int dimen;

       tree type;
     }
     temp;
       tree type;
     }
     temp;

+

     /* All other types.  */
     /* All other types.  */

-    gfc_array_info info;
+    gfc_array_info array;

   }
   data;
 
   }
   data;
 

+  /* This is used by assignments requiring temporaries.  The bits specify which
+     loops the terms appear in.  This will be 1 for the RHS expressions,
+     2 for the LHS expressions, and 3(=1|2) for the temporary.  */
+  unsigned useflags:2;
+
+  /* Suppresses precalculation of scalars in WHERE assignments.  */
+  unsigned where:1;
+}
+gfc_ss_info;
+
+#define gfc_get_ss_info() XCNEW (gfc_ss_info)
+
+
+/* Scalarization State chain.  Created by walking an expression tree before
+   creating the scalarization loops.  Then passed as part of a gfc_se structure
+   to translate the expression inside the loop.  Note that these chains are
+   terminated by gfc_ss_terminator, not NULL.  A NULL pointer in a gfc_se
+   indicates to gfc_conv_* that this is a scalar expression.
+   SS structures can only belong to a single loopinfo.  They must be added
+   otherwise they will not get freed.  */
+
+typedef struct gfc_ss
+{
+  gfc_ss_info *info;
+
+  int dimen;
+  /* Translation from loop dimensions to actual array dimensions.
+     actual_dim = dim[loop_dim]  */
+  int dim[GFC_MAX_DIMENSIONS];
+

   /* All the SS in a loop and linked through loop_chain.  The SS for an
      expression are linked by the next pointer.  */
   struct gfc_ss *loop_chain;
   struct gfc_ss *next;
 
   /* All the SS in a loop and linked through loop_chain.  The SS for an
      expression are linked by the next pointer.  */
   struct gfc_ss *loop_chain;
   struct gfc_ss *next;
 

-  /* This is used by assignments requiring temporaries. The bits specify which
-     loops the terms appear in.  This will be 1 for the RHS expressions,
-     2 for the LHS expressions, and 3(=1|2) for the temporary.  The bit
-     'where' suppresses precalculation of scalars in WHERE assignments.  */
-  unsigned useflags:2, where:1, is_alloc_lhs:1;
+  /* Non-null if the ss is part of a nested loop.  */
+  struct gfc_ss *parent;
+
+  /* The loop this gfc_ss is in.  */
+  struct gfc_loopinfo *loop;
+
+  unsigned is_alloc_lhs:1;

 }
 gfc_ss;
 #define gfc_get_ss() XCNEW (gfc_ss)
 }
 gfc_ss;
 #define gfc_get_ss() XCNEW (gfc_ss)