Revert work around for PR40521

[pf3gnuchains/gcc-fork.git] / libgfortran / generated / transpose_i4.c

diff --git a/libgfortran/generated/transpose_i4.c b/libgfortran/generated/transpose_i4.c
index b3979a8..9b15e47 100644 (file)
--- a/libgfortran/generated/transpose_i4.c
+++ b/libgfortran/generated/transpose_i4.c
@@ -1,5 +1,5 @@
 /* Implementation of the TRANSPOSE intrinsic
 /* Implementation of the TRANSPOSE intrinsic

-   Copyright 2003, 2005 Free Software Foundation, Inc.
+   Copyright 2003, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.

    Contributed by Tobias Schlüter
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
    Contributed by Tobias Schlüter
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).


@@ -7,42 +7,39 @@ 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
 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

-version 2 of the License, or (at your option) any later version.
-
-In addition to the permissions in the GNU General Public License, the
-Free Software Foundation gives you unlimited permission to link the
-compiled version of this file into combinations with other programs,
-and to distribute those combinations without any restriction coming
-from the use of this file.  (The General Public License restrictions
-do apply in other respects; for example, they cover modification of
-the file, and distribution when not linked into a combine
-executable.)
+version 3 of the License, or (at your option) any later version.

 
 Libgfortran is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 
 Libgfortran is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 

-You should have received a copy of the GNU General Public
-License along with libgfortran; see the file COPYING.  If not,
-write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */

 
 

-#include "config.h"
-#include <assert.h>

 #include "libgfortran.h"
 #include "libgfortran.h"

+#include <assert.h>
+

 
 #if defined (HAVE_GFC_INTEGER_4)
 
 
 #if defined (HAVE_GFC_INTEGER_4)
 

-extern void transpose_i4 (gfc_array_i4 * ret, gfc_array_i4 * source);
+extern void transpose_i4 (gfc_array_i4 * const restrict ret, 
+       gfc_array_i4 * const restrict source);

 export_proto(transpose_i4);
 
 void
 export_proto(transpose_i4);
 
 void

-transpose_i4 (gfc_array_i4 * ret, gfc_array_i4 * source)
+transpose_i4 (gfc_array_i4 * const restrict ret, 
+       gfc_array_i4 * const restrict source)

 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;

-  GFC_INTEGER_4 *rptr;
+  GFC_INTEGER_4 * restrict rptr;

   /* s.* indicates the source array.  */
   index_type sxstride, systride;
   const GFC_INTEGER_4 *sptr;
   /* s.* indicates the source array.  */
   index_type sxstride, systride;
   const GFC_INTEGER_4 *sptr;


@@ -57,30 +54,45 @@ transpose_i4 (gfc_array_i4 * ret, gfc_array_i4 * source)
       assert (GFC_DESCRIPTOR_RANK (ret) == 2);
       assert (ret->dtype == source->dtype);
 
       assert (GFC_DESCRIPTOR_RANK (ret) == 2);
       assert (ret->dtype == source->dtype);
 

-      ret->dim[0].lbound = 0;
-      ret->dim[0].ubound = source->dim[1].ubound - source->dim[1].lbound;
-      ret->dim[0].stride = 1;
+      GFC_DIMENSION_SET(ret->dim[0], 0, GFC_DESCRIPTOR_EXTENT(source,1) - 1,
+                       1);

 
 

-      ret->dim[1].lbound = 0;
-      ret->dim[1].ubound = source->dim[0].ubound - source->dim[0].lbound;
-      ret->dim[1].stride = ret->dim[0].ubound+1;
+      GFC_DIMENSION_SET(ret->dim[1], 0, GFC_DESCRIPTOR_EXTENT(source,0) - 1,
+                       GFC_DESCRIPTOR_EXTENT(source, 1));

 
       ret->data = internal_malloc_size (sizeof (GFC_INTEGER_4) * size0 ((array_t *) ret));
       ret->offset = 0;
 
       ret->data = internal_malloc_size (sizeof (GFC_INTEGER_4) * size0 ((array_t *) ret));
       ret->offset = 0;

-    }
+    } else if (unlikely (compile_options.bounds_check))
+    {
+      index_type ret_extent, src_extent;
+
+      ret_extent = GFC_DESCRIPTOR_EXTENT(ret,0);
+      src_extent = GFC_DESCRIPTOR_EXTENT(source,1);
+
+      if (src_extent != ret_extent)
+       runtime_error ("Incorrect extent in return value of TRANSPOSE"
+                      " intrinsic in dimension 1: is %ld,"
+                      " should be %ld", (long int) src_extent,
+                      (long int) ret_extent);

 
 

-  if (ret->dim[0].stride == 0)
-    ret->dim[0].stride = 1;
-  if (source->dim[0].stride == 0)
-    source->dim[0].stride = 1;
+      ret_extent = GFC_DESCRIPTOR_EXTENT(ret,1);
+      src_extent = GFC_DESCRIPTOR_EXTENT(source,0);
+
+      if (src_extent != ret_extent)
+       runtime_error ("Incorrect extent in return value of TRANSPOSE"
+                      " intrinsic in dimension 2: is %ld,"
+                      " should be %ld", (long int) src_extent,
+                      (long int) ret_extent);
+
+    }

 
 

-  sxstride = source->dim[0].stride;
-  systride = source->dim[1].stride;
-  xcount = source->dim[0].ubound + 1 - source->dim[0].lbound;
-  ycount = source->dim[1].ubound + 1 - source->dim[1].lbound;
+  sxstride = GFC_DESCRIPTOR_STRIDE(source,0);
+  systride = GFC_DESCRIPTOR_STRIDE(source,1);
+  xcount = GFC_DESCRIPTOR_EXTENT(source,0);
+  ycount = GFC_DESCRIPTOR_EXTENT(source,1);

 
 

-  rxstride = ret->dim[0].stride;
-  rystride = ret->dim[1].stride;
+  rxstride = GFC_DESCRIPTOR_STRIDE(ret,0);
+  rystride = GFC_DESCRIPTOR_STRIDE(ret,1);

 
   rptr = ret->data;
   sptr = source->data;
 
   rptr = ret->data;
   sptr = source->data;