+2008-10-15 Thomas Koenig <tkoenig@gcc.gnu.org>
+
+ PR libfortran/34670
+ * gfortran.dg/reshape_3.f90: New test.
+ * gfortran.dg/reshape_4.f90: New test.
+ * gfortran.dg/reshape_order_1.f90: Use correct shape.
+ * gfortran.dg/reshape_order_2.f90: Likewise.
+ * gfortran.dg/reshape_order_3.f90: Likewise.
+ * gfortran.dg/reshape_order_4.f90: Likewise.
+
2008-10-15 Jan Sjodin <jan.sjodin@amd.com>
Harsha Jagasia <harsha.jagasia@amd.com>
program main
implicit none
integer(kind=1), dimension(6) :: source1 = (/ 1, 2, 3, 4, 5, 6 /)
- integer, dimension(2) :: shape1 = (/ 2, 5/)
+ integer, dimension(2) :: shape1 = (/ 2, 3/)
integer(kind=1), dimension(2) :: pad1 = (/ 0, 0/)
character(len=200) :: l1, l2
integer :: i1, i2
program main
implicit none
integer(kind=1), dimension(6) :: source1 = (/ 1, 2, 3, 4, 5, 6 /)
- integer, dimension(2) :: shape1 = (/ 2, 5/)
+ integer, dimension(2) :: shape1 = (/ 2, 3/)
integer(kind=1), dimension(2) :: pad1 = (/ 0, 0/)
character(len=200) :: l1, l2
integer :: i1, i2
program main
implicit none
integer(kind=4), dimension(6) :: source1 = (/ 1, 2, 3, 4, 5, 6 /)
- integer, dimension(2) :: shape1 = (/ 2, 5/)
+ integer, dimension(2) :: shape1 = (/ 2, 3/)
integer(kind=4), dimension(2) :: pad1 = (/ 0, 0/)
character(len=200) :: l1, l2
integer :: i1, i2
program main
implicit none
integer(kind=4), dimension(6) :: source1 = (/ 1, 2, 3, 4, 5, 6 /)
- integer, dimension(2) :: shape1 = (/ 2, 5/)
+ integer, dimension(2) :: shape1 = (/ 2, 3/)
integer(kind=4), dimension(2) :: pad1 = (/ 0, 0/)
character(len=200) :: l1, l2
integer :: i1, i2
+2008-10-15 Thomas Koenig <tkoenig@gcc.gnu.org>
+
+ PR libfortran/34670
+ * intrinsics/reshape_generic.c: Add bounds checking.
+ * m4/reshape.m4: Likewise.
+ * generated/reshape_c10.c: Regenerated.
+ * generated/reshape_c16.c: Regenerated.
+ * generated/reshape_c4.c: Regenerated.
+ * generated/reshape_c8.c: Regenerated.
+ * generated/reshape_i16.c: Regenerated.
+ * generated/reshape_i4.c: Regenerated.
+ * generated/reshape_i8.c: Regenerated.
+ * generated/reshape_r10.c: Regenerated.
+ * generated/reshape_r16.c: Regenerated.
+ * generated/reshape_r4.c: Regenerated.
+ * generated/reshape_r8.c: Regenerated.
+ * generated/spread_r4.c: Regenerated.
+
2008-10-13 Jerry DeLisle <jvdelisle@gcc.gnu.org
PR libfortran/37083
if (unlikely (compile_options.bounds_check))
{
+ index_type ret_extent, source_extent;
+
+ rs = 1;
+ for (n = 0; n < rdim; n++)
+ {
+ rs *= shape_data[n];
+ ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+ if (ret_extent != shape_data[n])
+ runtime_error("Incorrect extent in return value of RESHAPE"
+ " intrinsic in dimension %ld: is %ld,"
+ " should be %ld", (long int) n+1,
+ (long int) ret_extent, (long int) shape_data[n]);
+ }
+
+ source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+ if (rs != source_extent)
+ runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+ " intrinsic: is %ld, should be %ld",
+ (long int) source_extent, (long int) rs);
+
if (order)
{
int seen[GFC_MAX_DIMENSIONS];
if (unlikely (compile_options.bounds_check))
{
+ index_type ret_extent, source_extent;
+
+ rs = 1;
+ for (n = 0; n < rdim; n++)
+ {
+ rs *= shape_data[n];
+ ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+ if (ret_extent != shape_data[n])
+ runtime_error("Incorrect extent in return value of RESHAPE"
+ " intrinsic in dimension %ld: is %ld,"
+ " should be %ld", (long int) n+1,
+ (long int) ret_extent, (long int) shape_data[n]);
+ }
+
+ source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+ if (rs != source_extent)
+ runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+ " intrinsic: is %ld, should be %ld",
+ (long int) source_extent, (long int) rs);
+
if (order)
{
int seen[GFC_MAX_DIMENSIONS];
if (unlikely (compile_options.bounds_check))
{
+ index_type ret_extent, source_extent;
+
+ rs = 1;
+ for (n = 0; n < rdim; n++)
+ {
+ rs *= shape_data[n];
+ ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+ if (ret_extent != shape_data[n])
+ runtime_error("Incorrect extent in return value of RESHAPE"
+ " intrinsic in dimension %ld: is %ld,"
+ " should be %ld", (long int) n+1,
+ (long int) ret_extent, (long int) shape_data[n]);
+ }
+
+ source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+ if (rs != source_extent)
+ runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+ " intrinsic: is %ld, should be %ld",
+ (long int) source_extent, (long int) rs);
+
if (order)
{
int seen[GFC_MAX_DIMENSIONS];
if (unlikely (compile_options.bounds_check))
{
+ index_type ret_extent, source_extent;
+
+ rs = 1;
+ for (n = 0; n < rdim; n++)
+ {
+ rs *= shape_data[n];
+ ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+ if (ret_extent != shape_data[n])
+ runtime_error("Incorrect extent in return value of RESHAPE"
+ " intrinsic in dimension %ld: is %ld,"
+ " should be %ld", (long int) n+1,
+ (long int) ret_extent, (long int) shape_data[n]);
+ }
+
+ source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+ if (rs != source_extent)
+ runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+ " intrinsic: is %ld, should be %ld",
+ (long int) source_extent, (long int) rs);
+
if (order)
{
int seen[GFC_MAX_DIMENSIONS];
if (unlikely (compile_options.bounds_check))
{
+ index_type ret_extent, source_extent;
+
+ rs = 1;
+ for (n = 0; n < rdim; n++)
+ {
+ rs *= shape_data[n];
+ ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+ if (ret_extent != shape_data[n])
+ runtime_error("Incorrect extent in return value of RESHAPE"
+ " intrinsic in dimension %ld: is %ld,"
+ " should be %ld", (long int) n+1,
+ (long int) ret_extent, (long int) shape_data[n]);
+ }
+
+ source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+ if (rs != source_extent)
+ runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+ " intrinsic: is %ld, should be %ld",
+ (long int) source_extent, (long int) rs);
+
if (order)
{
int seen[GFC_MAX_DIMENSIONS];
if (unlikely (compile_options.bounds_check))
{
+ index_type ret_extent, source_extent;
+
+ rs = 1;
+ for (n = 0; n < rdim; n++)
+ {
+ rs *= shape_data[n];
+ ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+ if (ret_extent != shape_data[n])
+ runtime_error("Incorrect extent in return value of RESHAPE"
+ " intrinsic in dimension %ld: is %ld,"
+ " should be %ld", (long int) n+1,
+ (long int) ret_extent, (long int) shape_data[n]);
+ }
+
+ source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+ if (rs != source_extent)
+ runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+ " intrinsic: is %ld, should be %ld",
+ (long int) source_extent, (long int) rs);
+
if (order)
{
int seen[GFC_MAX_DIMENSIONS];
if (unlikely (compile_options.bounds_check))
{
+ index_type ret_extent, source_extent;
+
+ rs = 1;
+ for (n = 0; n < rdim; n++)
+ {
+ rs *= shape_data[n];
+ ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+ if (ret_extent != shape_data[n])
+ runtime_error("Incorrect extent in return value of RESHAPE"
+ " intrinsic in dimension %ld: is %ld,"
+ " should be %ld", (long int) n+1,
+ (long int) ret_extent, (long int) shape_data[n]);
+ }
+
+ source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+ if (rs != source_extent)
+ runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+ " intrinsic: is %ld, should be %ld",
+ (long int) source_extent, (long int) rs);
+
if (order)
{
int seen[GFC_MAX_DIMENSIONS];
if (unlikely (compile_options.bounds_check))
{
+ index_type ret_extent, source_extent;
+
+ rs = 1;
+ for (n = 0; n < rdim; n++)
+ {
+ rs *= shape_data[n];
+ ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+ if (ret_extent != shape_data[n])
+ runtime_error("Incorrect extent in return value of RESHAPE"
+ " intrinsic in dimension %ld: is %ld,"
+ " should be %ld", (long int) n+1,
+ (long int) ret_extent, (long int) shape_data[n]);
+ }
+
+ source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+ if (rs != source_extent)
+ runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+ " intrinsic: is %ld, should be %ld",
+ (long int) source_extent, (long int) rs);
+
if (order)
{
int seen[GFC_MAX_DIMENSIONS];
if (unlikely (compile_options.bounds_check))
{
+ index_type ret_extent, source_extent;
+
+ rs = 1;
+ for (n = 0; n < rdim; n++)
+ {
+ rs *= shape_data[n];
+ ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+ if (ret_extent != shape_data[n])
+ runtime_error("Incorrect extent in return value of RESHAPE"
+ " intrinsic in dimension %ld: is %ld,"
+ " should be %ld", (long int) n+1,
+ (long int) ret_extent, (long int) shape_data[n]);
+ }
+
+ source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+ if (rs != source_extent)
+ runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+ " intrinsic: is %ld, should be %ld",
+ (long int) source_extent, (long int) rs);
+
if (order)
{
int seen[GFC_MAX_DIMENSIONS];
if (unlikely (compile_options.bounds_check))
{
+ index_type ret_extent, source_extent;
+
+ rs = 1;
+ for (n = 0; n < rdim; n++)
+ {
+ rs *= shape_data[n];
+ ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+ if (ret_extent != shape_data[n])
+ runtime_error("Incorrect extent in return value of RESHAPE"
+ " intrinsic in dimension %ld: is %ld,"
+ " should be %ld", (long int) n+1,
+ (long int) ret_extent, (long int) shape_data[n]);
+ }
+
+ source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+ if (rs != source_extent)
+ runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+ " intrinsic: is %ld, should be %ld",
+ (long int) source_extent, (long int) rs);
+
if (order)
{
int seen[GFC_MAX_DIMENSIONS];
if (unlikely (compile_options.bounds_check))
{
+ index_type ret_extent, source_extent;
+
+ rs = 1;
+ for (n = 0; n < rdim; n++)
+ {
+ rs *= shape_data[n];
+ ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+ if (ret_extent != shape_data[n])
+ runtime_error("Incorrect extent in return value of RESHAPE"
+ " intrinsic in dimension %ld: is %ld,"
+ " should be %ld", (long int) n+1,
+ (long int) ret_extent, (long int) shape_data[n]);
+ }
+
+ source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+ if (rs != source_extent)
+ runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+ " intrinsic: is %ld, should be %ld",
+ (long int) source_extent, (long int) rs);
+
if (order)
{
int seen[GFC_MAX_DIMENSIONS];
if (n == along - 1)
{
rdelta = ret->dim[n].stride;
-
+ printf("ret_extent = %ld, ncopies = %ld\n",
+ (long int) ret_extent, (long int) ncopies);
if (ret_extent != ncopies)
runtime_error("Incorrect extent in return value of SPREAD"
" intrinsic in dimension %ld: is %ld,"
if (unlikely (compile_options.bounds_check))
{
+ index_type ret_extent, source_extent;
+
+ rs = 1;
+ for (n = 0; n < rdim; n++)
+ {
+ rs *= shape_data[n];
+ ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+ if (ret_extent != shape_data[n])
+ runtime_error("Incorrect extent in return value of RESHAPE"
+ " intrinsic in dimension %ld: is %ld,"
+ " should be %ld", (long int) n+1,
+ (long int) ret_extent, (long int) shape_data[n]);
+ }
+
+ source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+ if (rs != source_extent)
+ runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+ " intrinsic: is %ld, should be %ld",
+ (long int) source_extent, (long int) rs);
+
if (order)
{
int seen[GFC_MAX_DIMENSIONS];
if (unlikely (compile_options.bounds_check))
{
+ index_type ret_extent, source_extent;
+
+ rs = 1;
+ for (n = 0; n < rdim; n++)
+ {
+ rs *= shape_data[n];
+ ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+ if (ret_extent != shape_data[n])
+ runtime_error("Incorrect extent in return value of RESHAPE"
+ " intrinsic in dimension %ld: is %ld,"
+ " should be %ld", (long int) n+1,
+ (long int) ret_extent, (long int) shape_data[n]);
+ }
+
+ source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+ if (rs != source_extent)
+ runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+ " intrinsic: is %ld, should be %ld",
+ (long int) source_extent, (long int) rs);
+
if (order)
{
int seen[GFC_MAX_DIMENSIONS];