[gcc] GCC 4.5.0=>4.5.1

gcc/libgfortran/generated/unpack_i1.c

 /* Specific implementation of the UNPACK intrinsic
    Copyright 2008, 2009 Free Software Foundation, Inc.
    Contributed by Thomas Koenig <tkoenig@gcc.gnu.org>, based on
    unpack_generic.c by Paul Brook <paul@nowt.org>.
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
 
 Libgfortran is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either
@@ skipping 72 matching lines @@
 
   if (ret->data == NULL)
     {
       /* The front end has signalled that we need to populate the
          return array descriptor.  */
       dim = GFC_DESCRIPTOR_RANK (mask);
       rs = 1;
       for (n = 0; n < dim; n++)
         {
           count[n] = 0;
-          ret->dim[n].stride = rs;
-          ret->dim[n].lbound = 0;
-          ret->dim[n].ubound = mask->dim[n].ubound - mask->dim[n].lbound;
-          extent[n] = ret->dim[n].ubound + 1;
+          GFC_DIMENSION_SET(ret->dim[n], 0,
+                            GFC_DESCRIPTOR_EXTENT(mask,n) - 1, rs);
+          extent[n] = GFC_DESCRIPTOR_EXTENT(ret,n);
           empty = empty || extent[n] <= 0;
-          rstride[n] = ret->dim[n].stride;
-          mstride[n] = mask->dim[n].stride * mask_kind;
+          rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,n);
+          mstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(mask,n);
           rs *= extent[n];
         }
       ret->offset = 0;
       ret->data = internal_malloc_size (rs * sizeof (GFC_INTEGER_1));
     }
   else
     {
       dim = GFC_DESCRIPTOR_RANK (ret);
       for (n = 0; n < dim; n++)
         {
           count[n] = 0;
-          extent[n] = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+          extent[n] = GFC_DESCRIPTOR_EXTENT(ret,n);
           empty = empty || extent[n] <= 0;
-          rstride[n] = ret->dim[n].stride;
-          mstride[n] = mask->dim[n].stride * mask_kind;
+          rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,n);
+          mstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(mask,n);
         }
       if (rstride[0] == 0)
         rstride[0] = 1;
     }
 
   if (empty)
     return;
 
   if (mstride[0] == 0)
     mstride[0] = 1;
 
-  vstride0 = vector->dim[0].stride;
+  vstride0 = GFC_DESCRIPTOR_STRIDE(vector,0);
   if (vstride0 == 0)
     vstride0 = 1;
   rstride0 = rstride[0];
   mstride0 = mstride[0];
   rptr = ret->data;
   vptr = vector->data;
 
   while (rptr)
     {
       if (*mptr)
@@ skipping 91 matching lines @@
 
   if (ret->data == NULL)
     {
       /* The front end has signalled that we need to populate the
          return array descriptor.  */
       dim = GFC_DESCRIPTOR_RANK (mask);
       rs = 1;
       for (n = 0; n < dim; n++)
         {
           count[n] = 0;
-          ret->dim[n].stride = rs;
-          ret->dim[n].lbound = 0;
-          ret->dim[n].ubound = mask->dim[n].ubound - mask->dim[n].lbound;
-          extent[n] = ret->dim[n].ubound + 1;
+          GFC_DIMENSION_SET(ret->dim[n], 0,
+                            GFC_DESCRIPTOR_EXTENT(mask,n) - 1, rs);
+          extent[n] = GFC_DESCRIPTOR_EXTENT(ret,n);
           empty = empty || extent[n] <= 0;
-          rstride[n] = ret->dim[n].stride;
-          fstride[n] = field->dim[n].stride;
-          mstride[n] = mask->dim[n].stride * mask_kind;
+          rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,n);
+          fstride[n] = GFC_DESCRIPTOR_STRIDE(field,n);
+          mstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(mask,n);
           rs *= extent[n];
         }
       ret->offset = 0;
       ret->data = internal_malloc_size (rs * sizeof (GFC_INTEGER_1));
     }
   else
     {
       dim = GFC_DESCRIPTOR_RANK (ret);
       for (n = 0; n < dim; n++)
         {
           count[n] = 0;
-          extent[n] = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+          extent[n] = GFC_DESCRIPTOR_EXTENT(ret,n);
           empty = empty || extent[n] <= 0;
-          rstride[n] = ret->dim[n].stride;
-          fstride[n] = field->dim[n].stride;
-          mstride[n] = mask->dim[n].stride * mask_kind;
+          rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,n);
+          fstride[n] = GFC_DESCRIPTOR_STRIDE(field,n);
+          mstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(mask,n);
         }
       if (rstride[0] == 0)
         rstride[0] = 1;
     }
 
   if (empty)
     return;
 
   if (fstride[0] == 0)
     fstride[0] = 1;
   if (mstride[0] == 0)
     mstride[0] = 1;
 
-  vstride0 = vector->dim[0].stride;
+  vstride0 = GFC_DESCRIPTOR_STRIDE(vector,0);
   if (vstride0 == 0)
     vstride0 = 1;
   rstride0 = rstride[0];
   fstride0 = fstride[0];
   mstride0 = mstride[0];
   rptr = ret->data;
   fptr = field->data;
   vptr = vector->data;
 
   while (rptr)
@@ skipping 38 matching lines @@
               rptr += rstride[n];
               fptr += fstride[n];
               mptr += mstride[n];
             }
         }
     }
 }
 
 #endif