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

re PR fortran/35960 (run time abort with assignment of RESHAPEd zero sized array) 

2008-04-20  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR libfortran/35960
	* intrinsics/reshape_generic.c (reshape_internal): If the size
	of the resized array is zero, as determined by the SHAPE
	argument, return early.
	* m4/reshape.m4:  Likewise.
	* generated/reshape_i4.c:  Regererated.
	* generated/reshape_i8.c:  Regenerated.
	* generated/reshape_i16.c:  Regenerated.
	* generated/reshape_r4.c:  Regenerated.
	* generated/reshape_r8.c:  Regenerated.
	* generated/reshape_r10.c:  Regenerated.
	* generated/reshape_r16.c:  Regenerated.
	* generated/reshape_c4.c:  Regenerated.
	* generated/reshape_c8.c:  Regenerated.
	* generated/reshape_c10.c:  Regenerated.
	* generated/reshape_c16.c:  Regenerated.

2008-04-20  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR libfortran/35960
	* gfortran.dg/reshape_zerosize_1.f90:  New file.

From-SVN: r134490
This commit is contained in:
Thomas Koenig 2008-04-20 19:56:07 +00:00
parent eea05d39c7
commit 8c154b6557
16 changed files with 386 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2008-04-20 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/35960
* gfortran.dg/reshape_zerosize_1.f90: New file.
2008-04-20 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/alignment6.adb: New test.

39
gcc/testsuite/gfortran.dg/reshape_zerosize_1.f90 Normal file
View File

@ -0,0 +1,39 @@
! { dg-do run }
! PR 35960 - there was a run-time abort when the SHAPE argument to
! RESHAPE was zero-sized.
! Test case contributed by Dick Henderson.
program try_gf1065
! fails on Windows XP
! gcc version 4.4.0 20080312 (experimental) [trunk revision 133139]
call gf1065(1, 2, 3, 4, 7, 8, 9)
end
SUBROUTINE GF1065(nf1,nf2,nf3,nf4,nf7,nf8,nf9)
REAL RDA(10,9)
REAL RCA1(90)
integer ila(2)
RDA(NF9:NF8, NF7:NF3) = RESHAPE(RCA1,(/0,0/), (/1.0/),(/2,1/))
rDA(NF9:NF8, NF7:NF3) = RESHAPE(rCA1,(/0,0/),ORDER=(/2,1/))
ILA(1) = 5
ILA(2) = 0
rDA(NF4:NF8, NF7:NF3) = RESHAPE(rcA1,ILA)
RdA(NF4:NF8, NF7:NF3) = RESHAPE(RcA1,ILA,PAD=(/-1.0/))
ILA(1) = 0
ILA(2) = 5
RdA(NF9:NF8,NF4:NF8)=RESHAPE(RcA1,ILA,(/-1.0/),(/NF2,NF1/))
ILA(1) = 5
ILA(2) = 0
RdA(NF4:NF8, NF7:NF3) = RESHAPE(RcA1,ILA,ORDER=(/NF1,NF2/))
END SUBROUTINE

19
libgfortran/ChangeLog
View File

@ -1,3 +1,22 @@
2008-04-20 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/35960
* intrinsics/reshape_generic.c (reshape_internal): If the size
of the resized array is zero, as determined by the SHAPE
argument, return early.
* m4/reshape.m4: Likewise.
* generated/reshape_i4.c: Regererated.
* generated/reshape_i8.c: Regenerated.
* generated/reshape_i16.c: Regenerated.
* generated/reshape_r4.c: Regenerated.
* generated/reshape_r8.c: Regenerated.
* generated/reshape_r10.c: Regenerated.
* generated/reshape_r16.c: Regenerated.
* generated/reshape_c4.c: Regenerated.
* generated/reshape_c8.c: Regenerated.
* generated/reshape_c10.c: Regenerated.
* generated/reshape_c16.c: Regenerated.
2008-04-18 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/35457

33
libgfortran/generated/reshape_c10.c
View File

@ -81,16 +81,32 @@ reshape_c10 (gfc_array_c10 * const restrict ret,
const GFC_COMPLEX_10 *src;
int n;
int dim;
int sempty, pempty;
int sempty, pempty, shape_empty;
index_type shape_data[GFC_MAX_DIMENSIONS];
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
shape_empty = 0;
for (n = 0; n < rdim; n++)
{
shape_data[n] = shape->data[n * shape->dim[0].stride];
if (shape_data[n] <= 0)
{
shape_data[n] = 0;
shape_empty = 1;
}
}
if (ret->data == NULL)
{
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
rs = 1;
for (n = 0; n < rdim; n++)
{
ret->dim[n].lbound = 0;
rex = shape->data[n * shape->dim[0].stride];
rex = shape_data[n];
ret->dim[n].ubound = rex - 1;
ret->dim[n].stride = rs;
rs *= rex;
@ -99,10 +115,9 @@ reshape_c10 (gfc_array_c10 * const restrict ret,
ret->data = internal_malloc_size ( rs * sizeof (GFC_COMPLEX_10));
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
}
else
{
rdim = GFC_DESCRIPTOR_RANK (ret);
}
if (shape_empty)
return;
rsize = 1;
for (n = 0; n < rdim; n++)
@ -115,8 +130,10 @@ reshape_c10 (gfc_array_c10 * const restrict ret,
rcount[n] = 0;
rstride[n] = ret->dim[dim].stride;
rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
if (rextent[n] < 0)
rextent[n] == 0;
if (rextent[n] != shape->data[dim * shape->dim[0].stride])
if (rextent[n] != shape_data[dim])
runtime_error ("shape and target do not conform");
if (rsize == rstride[n])

33
libgfortran/generated/reshape_c16.c
View File

@ -81,16 +81,32 @@ reshape_c16 (gfc_array_c16 * const restrict ret,
const GFC_COMPLEX_16 *src;
int n;
int dim;
int sempty, pempty;
int sempty, pempty, shape_empty;
index_type shape_data[GFC_MAX_DIMENSIONS];
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
shape_empty = 0;
for (n = 0; n < rdim; n++)
{
shape_data[n] = shape->data[n * shape->dim[0].stride];
if (shape_data[n] <= 0)
{
shape_data[n] = 0;
shape_empty = 1;
}
}
if (ret->data == NULL)
{
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
rs = 1;
for (n = 0; n < rdim; n++)
{
ret->dim[n].lbound = 0;
rex = shape->data[n * shape->dim[0].stride];
rex = shape_data[n];
ret->dim[n].ubound = rex - 1;
ret->dim[n].stride = rs;
rs *= rex;
@ -99,10 +115,9 @@ reshape_c16 (gfc_array_c16 * const restrict ret,
ret->data = internal_malloc_size ( rs * sizeof (GFC_COMPLEX_16));
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
}
else
{
rdim = GFC_DESCRIPTOR_RANK (ret);
}
if (shape_empty)
return;
rsize = 1;
for (n = 0; n < rdim; n++)
@ -115,8 +130,10 @@ reshape_c16 (gfc_array_c16 * const restrict ret,
rcount[n] = 0;
rstride[n] = ret->dim[dim].stride;
rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
if (rextent[n] < 0)
rextent[n] == 0;
if (rextent[n] != shape->data[dim * shape->dim[0].stride])
if (rextent[n] != shape_data[dim])
runtime_error ("shape and target do not conform");
if (rsize == rstride[n])

33
libgfortran/generated/reshape_c4.c
View File

@ -81,16 +81,32 @@ reshape_c4 (gfc_array_c4 * const restrict ret,
const GFC_COMPLEX_4 *src;
int n;
int dim;
int sempty, pempty;
int sempty, pempty, shape_empty;
index_type shape_data[GFC_MAX_DIMENSIONS];
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
shape_empty = 0;
for (n = 0; n < rdim; n++)
{
shape_data[n] = shape->data[n * shape->dim[0].stride];
if (shape_data[n] <= 0)
{
shape_data[n] = 0;
shape_empty = 1;
}
}
if (ret->data == NULL)
{
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
rs = 1;
for (n = 0; n < rdim; n++)
{
ret->dim[n].lbound = 0;
rex = shape->data[n * shape->dim[0].stride];
rex = shape_data[n];
ret->dim[n].ubound = rex - 1;
ret->dim[n].stride = rs;
rs *= rex;
@ -99,10 +115,9 @@ reshape_c4 (gfc_array_c4 * const restrict ret,
ret->data = internal_malloc_size ( rs * sizeof (GFC_COMPLEX_4));
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
}
else
{
rdim = GFC_DESCRIPTOR_RANK (ret);
}
if (shape_empty)
return;
rsize = 1;
for (n = 0; n < rdim; n++)
@ -115,8 +130,10 @@ reshape_c4 (gfc_array_c4 * const restrict ret,
rcount[n] = 0;
rstride[n] = ret->dim[dim].stride;
rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
if (rextent[n] < 0)
rextent[n] == 0;
if (rextent[n] != shape->data[dim * shape->dim[0].stride])
if (rextent[n] != shape_data[dim])
runtime_error ("shape and target do not conform");
if (rsize == rstride[n])

33
libgfortran/generated/reshape_c8.c
View File

@ -81,16 +81,32 @@ reshape_c8 (gfc_array_c8 * const restrict ret,
const GFC_COMPLEX_8 *src;
int n;
int dim;
int sempty, pempty;
int sempty, pempty, shape_empty;
index_type shape_data[GFC_MAX_DIMENSIONS];
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
shape_empty = 0;
for (n = 0; n < rdim; n++)
{
shape_data[n] = shape->data[n * shape->dim[0].stride];
if (shape_data[n] <= 0)
{
shape_data[n] = 0;
shape_empty = 1;
}
}
if (ret->data == NULL)
{
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
rs = 1;
for (n = 0; n < rdim; n++)
{
ret->dim[n].lbound = 0;
rex = shape->data[n * shape->dim[0].stride];
rex = shape_data[n];
ret->dim[n].ubound = rex - 1;
ret->dim[n].stride = rs;
rs *= rex;
@ -99,10 +115,9 @@ reshape_c8 (gfc_array_c8 * const restrict ret,
ret->data = internal_malloc_size ( rs * sizeof (GFC_COMPLEX_8));
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
}
else
{
rdim = GFC_DESCRIPTOR_RANK (ret);
}
if (shape_empty)
return;
rsize = 1;
for (n = 0; n < rdim; n++)
@ -115,8 +130,10 @@ reshape_c8 (gfc_array_c8 * const restrict ret,
rcount[n] = 0;
rstride[n] = ret->dim[dim].stride;
rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
if (rextent[n] < 0)
rextent[n] == 0;
if (rextent[n] != shape->data[dim * shape->dim[0].stride])
if (rextent[n] != shape_data[dim])
runtime_error ("shape and target do not conform");
if (rsize == rstride[n])

33
libgfortran/generated/reshape_i16.c
View File

@ -81,16 +81,32 @@ reshape_16 (gfc_array_i16 * const restrict ret,
const GFC_INTEGER_16 *src;
int n;
int dim;
int sempty, pempty;
int sempty, pempty, shape_empty;
index_type shape_data[GFC_MAX_DIMENSIONS];
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
shape_empty = 0;
for (n = 0; n < rdim; n++)
{
shape_data[n] = shape->data[n * shape->dim[0].stride];
if (shape_data[n] <= 0)
{
shape_data[n] = 0;
shape_empty = 1;
}
}
if (ret->data == NULL)
{
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
rs = 1;
for (n = 0; n < rdim; n++)
{
ret->dim[n].lbound = 0;
rex = shape->data[n * shape->dim[0].stride];
rex = shape_data[n];
ret->dim[n].ubound = rex - 1;
ret->dim[n].stride = rs;
rs *= rex;
@ -99,10 +115,9 @@ reshape_16 (gfc_array_i16 * const restrict ret,
ret->data = internal_malloc_size ( rs * sizeof (GFC_INTEGER_16));
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
}
else
{
rdim = GFC_DESCRIPTOR_RANK (ret);
}
if (shape_empty)
return;
rsize = 1;
for (n = 0; n < rdim; n++)
@ -115,8 +130,10 @@ reshape_16 (gfc_array_i16 * const restrict ret,
rcount[n] = 0;
rstride[n] = ret->dim[dim].stride;
rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
if (rextent[n] < 0)
rextent[n] == 0;
if (rextent[n] != shape->data[dim * shape->dim[0].stride])
if (rextent[n] != shape_data[dim])
runtime_error ("shape and target do not conform");
if (rsize == rstride[n])

33
libgfortran/generated/reshape_i4.c
View File

@ -81,16 +81,32 @@ reshape_4 (gfc_array_i4 * const restrict ret,
const GFC_INTEGER_4 *src;
int n;
int dim;
int sempty, pempty;
int sempty, pempty, shape_empty;
index_type shape_data[GFC_MAX_DIMENSIONS];
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
shape_empty = 0;
for (n = 0; n < rdim; n++)
{
shape_data[n] = shape->data[n * shape->dim[0].stride];
if (shape_data[n] <= 0)
{
shape_data[n] = 0;
shape_empty = 1;
}
}
if (ret->data == NULL)
{
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
rs = 1;
for (n = 0; n < rdim; n++)
{
ret->dim[n].lbound = 0;
rex = shape->data[n * shape->dim[0].stride];
rex = shape_data[n];
ret->dim[n].ubound = rex - 1;
ret->dim[n].stride = rs;
rs *= rex;
@ -99,10 +115,9 @@ reshape_4 (gfc_array_i4 * const restrict ret,
ret->data = internal_malloc_size ( rs * sizeof (GFC_INTEGER_4));
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
}
else
{
rdim = GFC_DESCRIPTOR_RANK (ret);
}
if (shape_empty)
return;
rsize = 1;
for (n = 0; n < rdim; n++)
@ -115,8 +130,10 @@ reshape_4 (gfc_array_i4 * const restrict ret,
rcount[n] = 0;
rstride[n] = ret->dim[dim].stride;
rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
if (rextent[n] < 0)
rextent[n] == 0;
if (rextent[n] != shape->data[dim * shape->dim[0].stride])
if (rextent[n] != shape_data[dim])
runtime_error ("shape and target do not conform");
if (rsize == rstride[n])

33
libgfortran/generated/reshape_i8.c
View File

@ -81,16 +81,32 @@ reshape_8 (gfc_array_i8 * const restrict ret,
const GFC_INTEGER_8 *src;
int n;
int dim;
int sempty, pempty;
int sempty, pempty, shape_empty;
index_type shape_data[GFC_MAX_DIMENSIONS];
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
shape_empty = 0;
for (n = 0; n < rdim; n++)
{
shape_data[n] = shape->data[n * shape->dim[0].stride];
if (shape_data[n] <= 0)
{
shape_data[n] = 0;
shape_empty = 1;
}
}
if (ret->data == NULL)
{
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
rs = 1;
for (n = 0; n < rdim; n++)
{
ret->dim[n].lbound = 0;
rex = shape->data[n * shape->dim[0].stride];
rex = shape_data[n];
ret->dim[n].ubound = rex - 1;
ret->dim[n].stride = rs;
rs *= rex;
@ -99,10 +115,9 @@ reshape_8 (gfc_array_i8 * const restrict ret,
ret->data = internal_malloc_size ( rs * sizeof (GFC_INTEGER_8));
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
}
else
{
rdim = GFC_DESCRIPTOR_RANK (ret);
}
if (shape_empty)
return;
rsize = 1;
for (n = 0; n < rdim; n++)
@ -115,8 +130,10 @@ reshape_8 (gfc_array_i8 * const restrict ret,
rcount[n] = 0;
rstride[n] = ret->dim[dim].stride;
rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
if (rextent[n] < 0)
rextent[n] == 0;
if (rextent[n] != shape->data[dim * shape->dim[0].stride])
if (rextent[n] != shape_data[dim])
runtime_error ("shape and target do not conform");
if (rsize == rstride[n])

33
libgfortran/generated/reshape_r10.c
View File

@ -81,16 +81,32 @@ reshape_r10 (gfc_array_r10 * const restrict ret,
const GFC_REAL_10 *src;
int n;
int dim;
int sempty, pempty;
int sempty, pempty, shape_empty;
index_type shape_data[GFC_MAX_DIMENSIONS];
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
shape_empty = 0;
for (n = 0; n < rdim; n++)
{
shape_data[n] = shape->data[n * shape->dim[0].stride];
if (shape_data[n] <= 0)
{
shape_data[n] = 0;
shape_empty = 1;
}
}
if (ret->data == NULL)
{
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
rs = 1;
for (n = 0; n < rdim; n++)
{
ret->dim[n].lbound = 0;
rex = shape->data[n * shape->dim[0].stride];
rex = shape_data[n];
ret->dim[n].ubound = rex - 1;
ret->dim[n].stride = rs;
rs *= rex;
@ -99,10 +115,9 @@ reshape_r10 (gfc_array_r10 * const restrict ret,
ret->data = internal_malloc_size ( rs * sizeof (GFC_REAL_10));
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
}
else
{
rdim = GFC_DESCRIPTOR_RANK (ret);
}
if (shape_empty)
return;
rsize = 1;
for (n = 0; n < rdim; n++)
@ -115,8 +130,10 @@ reshape_r10 (gfc_array_r10 * const restrict ret,
rcount[n] = 0;
rstride[n] = ret->dim[dim].stride;
rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
if (rextent[n] < 0)
rextent[n] == 0;
if (rextent[n] != shape->data[dim * shape->dim[0].stride])
if (rextent[n] != shape_data[dim])
runtime_error ("shape and target do not conform");
if (rsize == rstride[n])

33
libgfortran/generated/reshape_r16.c
View File

@ -81,16 +81,32 @@ reshape_r16 (gfc_array_r16 * const restrict ret,
const GFC_REAL_16 *src;
int n;
int dim;
int sempty, pempty;
int sempty, pempty, shape_empty;
index_type shape_data[GFC_MAX_DIMENSIONS];
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
shape_empty = 0;
for (n = 0; n < rdim; n++)
{
shape_data[n] = shape->data[n * shape->dim[0].stride];
if (shape_data[n] <= 0)
{
shape_data[n] = 0;
shape_empty = 1;
}
}
if (ret->data == NULL)
{
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
rs = 1;
for (n = 0; n < rdim; n++)
{
ret->dim[n].lbound = 0;
rex = shape->data[n * shape->dim[0].stride];
rex = shape_data[n];
ret->dim[n].ubound = rex - 1;
ret->dim[n].stride = rs;
rs *= rex;
@ -99,10 +115,9 @@ reshape_r16 (gfc_array_r16 * const restrict ret,
ret->data = internal_malloc_size ( rs * sizeof (GFC_REAL_16));
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
}
else
{
rdim = GFC_DESCRIPTOR_RANK (ret);
}
if (shape_empty)
return;
rsize = 1;
for (n = 0; n < rdim; n++)
@ -115,8 +130,10 @@ reshape_r16 (gfc_array_r16 * const restrict ret,
rcount[n] = 0;
rstride[n] = ret->dim[dim].stride;
rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
if (rextent[n] < 0)
rextent[n] == 0;
if (rextent[n] != shape->data[dim * shape->dim[0].stride])
if (rextent[n] != shape_data[dim])
runtime_error ("shape and target do not conform");
if (rsize == rstride[n])

33
libgfortran/generated/reshape_r4.c
View File

@ -81,16 +81,32 @@ reshape_r4 (gfc_array_r4 * const restrict ret,
const GFC_REAL_4 *src;
int n;
int dim;
int sempty, pempty;
int sempty, pempty, shape_empty;
index_type shape_data[GFC_MAX_DIMENSIONS];
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
shape_empty = 0;
for (n = 0; n < rdim; n++)
{
shape_data[n] = shape->data[n * shape->dim[0].stride];
if (shape_data[n] <= 0)
{
shape_data[n] = 0;
shape_empty = 1;
}
}
if (ret->data == NULL)
{
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
rs = 1;
for (n = 0; n < rdim; n++)
{
ret->dim[n].lbound = 0;
rex = shape->data[n * shape->dim[0].stride];
rex = shape_data[n];
ret->dim[n].ubound = rex - 1;
ret->dim[n].stride = rs;
rs *= rex;
@ -99,10 +115,9 @@ reshape_r4 (gfc_array_r4 * const restrict ret,
ret->data = internal_malloc_size ( rs * sizeof (GFC_REAL_4));
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
}
else
{
rdim = GFC_DESCRIPTOR_RANK (ret);
}
if (shape_empty)
return;
rsize = 1;
for (n = 0; n < rdim; n++)
@ -115,8 +130,10 @@ reshape_r4 (gfc_array_r4 * const restrict ret,
rcount[n] = 0;
rstride[n] = ret->dim[dim].stride;
rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
if (rextent[n] < 0)
rextent[n] == 0;
if (rextent[n] != shape->data[dim * shape->dim[0].stride])
if (rextent[n] != shape_data[dim])
runtime_error ("shape and target do not conform");
if (rsize == rstride[n])

33
libgfortran/generated/reshape_r8.c
View File

@ -81,16 +81,32 @@ reshape_r8 (gfc_array_r8 * const restrict ret,
const GFC_REAL_8 *src;
int n;
int dim;
int sempty, pempty;
int sempty, pempty, shape_empty;
index_type shape_data[GFC_MAX_DIMENSIONS];
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
shape_empty = 0;
for (n = 0; n < rdim; n++)
{
shape_data[n] = shape->data[n * shape->dim[0].stride];
if (shape_data[n] <= 0)
{
shape_data[n] = 0;
shape_empty = 1;
}
}
if (ret->data == NULL)
{
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
rs = 1;
for (n = 0; n < rdim; n++)
{
ret->dim[n].lbound = 0;
rex = shape->data[n * shape->dim[0].stride];
rex = shape_data[n];
ret->dim[n].ubound = rex - 1;
ret->dim[n].stride = rs;
rs *= rex;
@ -99,10 +115,9 @@ reshape_r8 (gfc_array_r8 * const restrict ret,
ret->data = internal_malloc_size ( rs * sizeof (GFC_REAL_8));
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
}
else
{
rdim = GFC_DESCRIPTOR_RANK (ret);
}
if (shape_empty)
return;
rsize = 1;
for (n = 0; n < rdim; n++)
@ -115,8 +130,10 @@ reshape_r8 (gfc_array_r8 * const restrict ret,
rcount[n] = 0;
rstride[n] = ret->dim[dim].stride;
rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
if (rextent[n] < 0)
rextent[n] == 0;
if (rextent[n] != shape->data[dim * shape->dim[0].stride])
if (rextent[n] != shape_data[dim])
runtime_error ("shape and target do not conform");
if (rsize == rstride[n])

30
libgfortran/intrinsics/reshape_generic.c
View File

@ -69,7 +69,24 @@ reshape_internal (parray *ret, parray *source, shape_type *shape,
const char *src;
int n;
int dim;
int sempty, pempty;
int sempty, pempty, shape_empty;
index_type shape_data[GFC_MAX_DIMENSIONS];
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
shape_empty = 0;
for (n = 0; n < rdim; n++)
{
shape_data[n] = shape->data[n * shape->dim[0].stride];
if (shape_data[n] <= 0)
{
shape_data[n] = 0;
shape_empty = 1;
}
}
if (ret->data == NULL)
{
@ -78,7 +95,7 @@ reshape_internal (parray *ret, parray *source, shape_type *shape,
for (n = 0; n < rdim; n++)
{
ret->dim[n].lbound = 0;
rex = shape->data[n * shape->dim[0].stride];
rex = shape_data[n];
ret->dim[n].ubound = rex - 1;
ret->dim[n].stride = rs;
rs *= rex;
@ -87,10 +104,9 @@ reshape_internal (parray *ret, parray *source, shape_type *shape,
ret->data = internal_malloc_size ( rs * size );
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
}
else
{
rdim = GFC_DESCRIPTOR_RANK (ret);
}
if (shape_empty)
return;
rsize = 1;
for (n = 0; n < rdim; n++)
@ -104,7 +120,7 @@ reshape_internal (parray *ret, parray *source, shape_type *shape,
rstride[n] = ret->dim[dim].stride;
rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
if (rextent[n] != shape->data[dim * shape->dim[0].stride])
if (rextent[n] != shape_data[dim])
runtime_error ("shape and target do not conform");
if (rsize == rstride[n])

33
libgfortran/m4/reshape.m4
View File

@ -85,16 +85,32 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret,
const 'rtype_name` *src;
int n;
int dim;
int sempty, pempty;
int sempty, pempty, shape_empty;
index_type shape_data[GFC_MAX_DIMENSIONS];
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
shape_empty = 0;
for (n = 0; n < rdim; n++)
{
shape_data[n] = shape->data[n * shape->dim[0].stride];
if (shape_data[n] <= 0)
{
shape_data[n] = 0;
shape_empty = 1;
}
}
if (ret->data == NULL)
{
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
rs = 1;
for (n = 0; n < rdim; n++)
{
ret->dim[n].lbound = 0;
rex = shape->data[n * shape->dim[0].stride];
rex = shape_data[n];
ret->dim[n].ubound = rex - 1;
ret->dim[n].stride = rs;
rs *= rex;
@ -103,10 +119,9 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret,
ret->data = internal_malloc_size ( rs * sizeof ('rtype_name`));
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
}
else
{
rdim = GFC_DESCRIPTOR_RANK (ret);
}
if (shape_empty)
return;
rsize = 1;
for (n = 0; n < rdim; n++)
@ -119,8 +134,10 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret,
rcount[n] = 0;
rstride[n] = ret->dim[dim].stride;
rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
if (rextent[n] < 0)
rextent[n] == 0;
if (rextent[n] != shape->data[dim * shape->dim[0].stride])
if (rextent[n] != shape_data[dim])
runtime_error ("shape and target do not conform");
if (rsize == rstride[n])