* trans-array.c (gfc_conv_expr_descriptor): Move ndim initialization

	earlier.

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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7fe6988..a33dbe0 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-18  Mikael Morin  <mikael@gcc.gnu.org>
+
+       * trans-array.c (gfc_conv_expr_descriptor): Move ndim initialization
+       earlier.
+

 2011-10-18  Janus Weil  <janus@gcc.gnu.org>
 
        PR fortran/47023
 2011-10-18  Janus Weil  <janus@gcc.gnu.org>
 
        PR fortran/47023

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 585dc43..2c34590 100644 (file)
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -5974,6 +5974,8 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss)
       tree to;
       tree base;
 
       tree to;
       tree base;
 

+      ndim = info->ref ? info->ref->u.ar.dimen : info->dimen;
+

       if (se->want_coarray)
        {
          codim = gfc_get_corank (expr);
       if (se->want_coarray)
        {
          codim = gfc_get_corank (expr);


@@ -6046,7 +6048,6 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss)
       else
        base = NULL_TREE;
 
       else
        base = NULL_TREE;
 

-      ndim = info->ref ? info->ref->u.ar.dimen : info->dimen;

       for (n = 0; n < ndim; n++)
        {
          stride = gfc_conv_array_stride (desc, n);
       for (n = 0; n < ndim; n++)
        {
          stride = gfc_conv_array_stride (desc, n);