diff options
author | tkoenig <tkoenig@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-03-17 21:27:08 +0000 |
---|---|---|
committer | tkoenig <tkoenig@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-03-17 21:27:08 +0000 |
commit | f746796e6549a1303e9b52a940431517cfd6144b (patch) | |
tree | b7df398cd1d46d953da49fe122be584ed1f708bd /libgfortran | |
parent | e596bd680a5e6fc56a4bcf668d7bd958b3c9df25 (diff) | |
download | gcc-f746796e6549a1303e9b52a940431517cfd6144b.tar.gz |
2017-03-17 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/79956
* m4/reshape.m4 (reshape_'rtype_ccode`): Correct use
of GFC_ASSERT.
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@246248 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
-rw-r--r-- | libgfortran/ChangeLog | 17 | ||||
-rw-r--r-- | libgfortran/generated/reshape_c10.c | 2 | ||||
-rw-r--r-- | libgfortran/generated/reshape_c16.c | 2 | ||||
-rw-r--r-- | libgfortran/generated/reshape_c4.c | 2 | ||||
-rw-r--r-- | libgfortran/generated/reshape_c8.c | 2 | ||||
-rw-r--r-- | libgfortran/generated/reshape_i16.c | 2 | ||||
-rw-r--r-- | libgfortran/generated/reshape_i4.c | 2 | ||||
-rw-r--r-- | libgfortran/generated/reshape_i8.c | 2 | ||||
-rw-r--r-- | libgfortran/generated/reshape_r10.c | 2 | ||||
-rw-r--r-- | libgfortran/generated/reshape_r16.c | 2 | ||||
-rw-r--r-- | libgfortran/generated/reshape_r4.c | 2 | ||||
-rw-r--r-- | libgfortran/generated/reshape_r8.c | 2 | ||||
-rw-r--r-- | libgfortran/m4/reshape.m4 | 2 |
13 files changed, 29 insertions, 12 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 6ec73f6d51a..96b75e9292a 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,20 @@ +2017-03-17 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR libfortran/79956 + * m4/reshape.m4 (reshape_'rtype_ccode`): Correct use + of GFC_ASSERT. + * 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. + 2017-03-15 NightStrike <nightstrike@gmail.com> Janne Blomqvist <jb@gcc.gnu.org> diff --git a/libgfortran/generated/reshape_c10.c b/libgfortran/generated/reshape_c10.c index af45e960ee7..ce6c9a256dc 100644 --- a/libgfortran/generated/reshape_c10.c +++ b/libgfortran/generated/reshape_c10.c @@ -80,7 +80,7 @@ reshape_c10 (gfc_array_c10 * const restrict ret, rdim = GFC_DESCRIPTOR_EXTENT(shape,0); /* rdim is always > 0; this lets the compiler optimize more and avoids a potential warning. */ - GFC_ASSERT(sdim>0); + GFC_ASSERT(rdim>0); if (rdim != GFC_DESCRIPTOR_RANK(ret)) runtime_error("rank of return array incorrect in RESHAPE intrinsic"); diff --git a/libgfortran/generated/reshape_c16.c b/libgfortran/generated/reshape_c16.c index 977a53dbe47..4ca6722433e 100644 --- a/libgfortran/generated/reshape_c16.c +++ b/libgfortran/generated/reshape_c16.c @@ -80,7 +80,7 @@ reshape_c16 (gfc_array_c16 * const restrict ret, rdim = GFC_DESCRIPTOR_EXTENT(shape,0); /* rdim is always > 0; this lets the compiler optimize more and avoids a potential warning. */ - GFC_ASSERT(sdim>0); + GFC_ASSERT(rdim>0); if (rdim != GFC_DESCRIPTOR_RANK(ret)) runtime_error("rank of return array incorrect in RESHAPE intrinsic"); diff --git a/libgfortran/generated/reshape_c4.c b/libgfortran/generated/reshape_c4.c index fd94689a4c0..dc1b8ee6c74 100644 --- a/libgfortran/generated/reshape_c4.c +++ b/libgfortran/generated/reshape_c4.c @@ -80,7 +80,7 @@ reshape_c4 (gfc_array_c4 * const restrict ret, rdim = GFC_DESCRIPTOR_EXTENT(shape,0); /* rdim is always > 0; this lets the compiler optimize more and avoids a potential warning. */ - GFC_ASSERT(sdim>0); + GFC_ASSERT(rdim>0); if (rdim != GFC_DESCRIPTOR_RANK(ret)) runtime_error("rank of return array incorrect in RESHAPE intrinsic"); diff --git a/libgfortran/generated/reshape_c8.c b/libgfortran/generated/reshape_c8.c index 6377049397b..88d03d73148 100644 --- a/libgfortran/generated/reshape_c8.c +++ b/libgfortran/generated/reshape_c8.c @@ -80,7 +80,7 @@ reshape_c8 (gfc_array_c8 * const restrict ret, rdim = GFC_DESCRIPTOR_EXTENT(shape,0); /* rdim is always > 0; this lets the compiler optimize more and avoids a potential warning. */ - GFC_ASSERT(sdim>0); + GFC_ASSERT(rdim>0); if (rdim != GFC_DESCRIPTOR_RANK(ret)) runtime_error("rank of return array incorrect in RESHAPE intrinsic"); diff --git a/libgfortran/generated/reshape_i16.c b/libgfortran/generated/reshape_i16.c index 65576a31704..fd5e8e7e736 100644 --- a/libgfortran/generated/reshape_i16.c +++ b/libgfortran/generated/reshape_i16.c @@ -80,7 +80,7 @@ reshape_16 (gfc_array_i16 * const restrict ret, rdim = GFC_DESCRIPTOR_EXTENT(shape,0); /* rdim is always > 0; this lets the compiler optimize more and avoids a potential warning. */ - GFC_ASSERT(sdim>0); + GFC_ASSERT(rdim>0); if (rdim != GFC_DESCRIPTOR_RANK(ret)) runtime_error("rank of return array incorrect in RESHAPE intrinsic"); diff --git a/libgfortran/generated/reshape_i4.c b/libgfortran/generated/reshape_i4.c index d07b3a9c2d1..149d18575eb 100644 --- a/libgfortran/generated/reshape_i4.c +++ b/libgfortran/generated/reshape_i4.c @@ -80,7 +80,7 @@ reshape_4 (gfc_array_i4 * const restrict ret, rdim = GFC_DESCRIPTOR_EXTENT(shape,0); /* rdim is always > 0; this lets the compiler optimize more and avoids a potential warning. */ - GFC_ASSERT(sdim>0); + GFC_ASSERT(rdim>0); if (rdim != GFC_DESCRIPTOR_RANK(ret)) runtime_error("rank of return array incorrect in RESHAPE intrinsic"); diff --git a/libgfortran/generated/reshape_i8.c b/libgfortran/generated/reshape_i8.c index f48728d17be..a4c95a24b7a 100644 --- a/libgfortran/generated/reshape_i8.c +++ b/libgfortran/generated/reshape_i8.c @@ -80,7 +80,7 @@ reshape_8 (gfc_array_i8 * const restrict ret, rdim = GFC_DESCRIPTOR_EXTENT(shape,0); /* rdim is always > 0; this lets the compiler optimize more and avoids a potential warning. */ - GFC_ASSERT(sdim>0); + GFC_ASSERT(rdim>0); if (rdim != GFC_DESCRIPTOR_RANK(ret)) runtime_error("rank of return array incorrect in RESHAPE intrinsic"); diff --git a/libgfortran/generated/reshape_r10.c b/libgfortran/generated/reshape_r10.c index a5722d4244f..47e803fd562 100644 --- a/libgfortran/generated/reshape_r10.c +++ b/libgfortran/generated/reshape_r10.c @@ -80,7 +80,7 @@ reshape_r10 (gfc_array_r10 * const restrict ret, rdim = GFC_DESCRIPTOR_EXTENT(shape,0); /* rdim is always > 0; this lets the compiler optimize more and avoids a potential warning. */ - GFC_ASSERT(sdim>0); + GFC_ASSERT(rdim>0); if (rdim != GFC_DESCRIPTOR_RANK(ret)) runtime_error("rank of return array incorrect in RESHAPE intrinsic"); diff --git a/libgfortran/generated/reshape_r16.c b/libgfortran/generated/reshape_r16.c index c56b8717a83..c210dfdef52 100644 --- a/libgfortran/generated/reshape_r16.c +++ b/libgfortran/generated/reshape_r16.c @@ -80,7 +80,7 @@ reshape_r16 (gfc_array_r16 * const restrict ret, rdim = GFC_DESCRIPTOR_EXTENT(shape,0); /* rdim is always > 0; this lets the compiler optimize more and avoids a potential warning. */ - GFC_ASSERT(sdim>0); + GFC_ASSERT(rdim>0); if (rdim != GFC_DESCRIPTOR_RANK(ret)) runtime_error("rank of return array incorrect in RESHAPE intrinsic"); diff --git a/libgfortran/generated/reshape_r4.c b/libgfortran/generated/reshape_r4.c index 889813c07ec..a4f9b07f55c 100644 --- a/libgfortran/generated/reshape_r4.c +++ b/libgfortran/generated/reshape_r4.c @@ -80,7 +80,7 @@ reshape_r4 (gfc_array_r4 * const restrict ret, rdim = GFC_DESCRIPTOR_EXTENT(shape,0); /* rdim is always > 0; this lets the compiler optimize more and avoids a potential warning. */ - GFC_ASSERT(sdim>0); + GFC_ASSERT(rdim>0); if (rdim != GFC_DESCRIPTOR_RANK(ret)) runtime_error("rank of return array incorrect in RESHAPE intrinsic"); diff --git a/libgfortran/generated/reshape_r8.c b/libgfortran/generated/reshape_r8.c index 279f89dcf2c..955463c4645 100644 --- a/libgfortran/generated/reshape_r8.c +++ b/libgfortran/generated/reshape_r8.c @@ -80,7 +80,7 @@ reshape_r8 (gfc_array_r8 * const restrict ret, rdim = GFC_DESCRIPTOR_EXTENT(shape,0); /* rdim is always > 0; this lets the compiler optimize more and avoids a potential warning. */ - GFC_ASSERT(sdim>0); + GFC_ASSERT(rdim>0); if (rdim != GFC_DESCRIPTOR_RANK(ret)) runtime_error("rank of return array incorrect in RESHAPE intrinsic"); diff --git a/libgfortran/m4/reshape.m4 b/libgfortran/m4/reshape.m4 index 5ad1f136153..346d5389a10 100644 --- a/libgfortran/m4/reshape.m4 +++ b/libgfortran/m4/reshape.m4 @@ -84,7 +84,7 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret, rdim = GFC_DESCRIPTOR_EXTENT(shape,0); /* rdim is always > 0; this lets the compiler optimize more and avoids a potential warning. */ - GFC_ASSERT(sdim>0); + GFC_ASSERT(rdim>0); if (rdim != GFC_DESCRIPTOR_RANK(ret)) runtime_error("rank of return array incorrect in RESHAPE intrinsic"); |