OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libfortran/34670 (bounds checking for array intrinsics) 

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-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.

From-SVN: r141144
This commit is contained in:
Thomas Koenig 2008-10-15 16:27:58 +00:00
parent 2c7a7f46d8
commit 21c74256c3
20 changed files with 307 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,13 @@
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>

2
gcc/testsuite/gfortran.dg/reshape_order_1.f90
View File

@ -4,7 +4,7 @@
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

2
gcc/testsuite/gfortran.dg/reshape_order_2.f90
View File

@ -4,7 +4,7 @@
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

2
gcc/testsuite/gfortran.dg/reshape_order_3.f90
View File

@ -4,7 +4,7 @@
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

2
gcc/testsuite/gfortran.dg/reshape_order_4.f90
View File

@ -4,7 +4,7 @@
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

18
libgfortran/ChangeLog
View File

@ -1,3 +1,21 @@
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

21
libgfortran/generated/reshape_c10.c
View File

@ -121,6 +121,27 @@ reshape_c10 (gfc_array_c10 * const restrict ret,
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];

21
libgfortran/generated/reshape_c16.c
View File

@ -121,6 +121,27 @@ reshape_c16 (gfc_array_c16 * const restrict ret,
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];

21
libgfortran/generated/reshape_c4.c
View File

@ -121,6 +121,27 @@ reshape_c4 (gfc_array_c4 * const restrict ret,
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];

21
libgfortran/generated/reshape_c8.c
View File

@ -121,6 +121,27 @@ reshape_c8 (gfc_array_c8 * const restrict ret,
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];

21
libgfortran/generated/reshape_i16.c
View File

@ -121,6 +121,27 @@ reshape_16 (gfc_array_i16 * const restrict ret,
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];

21
libgfortran/generated/reshape_i4.c
View File

@ -121,6 +121,27 @@ reshape_4 (gfc_array_i4 * const restrict ret,
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];

21
libgfortran/generated/reshape_i8.c
View File

@ -121,6 +121,27 @@ reshape_8 (gfc_array_i8 * const restrict ret,
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];

21
libgfortran/generated/reshape_r10.c
View File

@ -121,6 +121,27 @@ reshape_r10 (gfc_array_r10 * const restrict ret,
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];

21
libgfortran/generated/reshape_r16.c
View File

@ -121,6 +121,27 @@ reshape_r16 (gfc_array_r16 * const restrict ret,
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];

21
libgfortran/generated/reshape_r4.c
View File

@ -121,6 +121,27 @@ reshape_r4 (gfc_array_r4 * const restrict ret,
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];

21
libgfortran/generated/reshape_r8.c
View File

@ -121,6 +121,27 @@ reshape_r8 (gfc_array_r8 * const restrict ret,
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];

3
libgfortran/generated/spread_r4.c
View File

@ -131,7 +131,8 @@ spread_r4 (gfc_array_r4 *ret, const gfc_array_r4 *source,
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,"

21
libgfortran/intrinsics/reshape_generic.c
View File

@ -110,6 +110,27 @@ reshape_internal (parray *ret, parray *source, shape_type *shape,
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];

21
libgfortran/m4/reshape.m4
View File

@ -125,6 +125,27 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret,
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];