From dba937c321471119dad87e4524e002e494837de0 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Fri, 17 Mar 2017 21:27:08 +0000 Subject: [PATCH] re PR libfortran/79956 (many new -Wmaybe-uninitialized warnings with bootstrap-O3) 2017-03-17 Thomas Koenig 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. From-SVN: r246248 --- libgfortran/ChangeLog | 17 +++++++++++++++++ libgfortran/generated/reshape_c10.c | 2 +- libgfortran/generated/reshape_c16.c | 2 +- libgfortran/generated/reshape_c4.c | 2 +- libgfortran/generated/reshape_c8.c | 2 +- libgfortran/generated/reshape_i16.c | 2 +- libgfortran/generated/reshape_i4.c | 2 +- libgfortran/generated/reshape_i8.c | 2 +- libgfortran/generated/reshape_r10.c | 2 +- libgfortran/generated/reshape_r16.c | 2 +- libgfortran/generated/reshape_r4.c | 2 +- libgfortran/generated/reshape_r8.c | 2 +- libgfortran/m4/reshape.m4 | 2 +- 13 files changed, 29 insertions(+), 12 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 6ec73f6d51a9..96b75e9292ad 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,20 @@ +2017-03-17 Thomas Koenig + + 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 Janne Blomqvist diff --git a/libgfortran/generated/reshape_c10.c b/libgfortran/generated/reshape_c10.c index af45e960ee7f..ce6c9a256dc4 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 977a53dbe475..4ca6722433e3 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 fd94689a4c0b..dc1b8ee6c74e 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 6377049397b0..88d03d731484 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 65576a31704b..fd5e8e7e7363 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 d07b3a9c2d10..149d18575eb8 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 f48728d17be7..a4c95a24b7a0 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 a5722d4244f6..47e803fd562a 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 c56b8717a839..c210dfdef52a 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 889813c07ece..a4f9b07f55c7 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 279f89dcf2cd..955463c46450 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 5ad1f1361531..346d5389a104 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"); -- 2.47.3