diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2017-03-15 07:45:39 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2017-03-15 07:45:39 +0000 |
| commit | 20305b5047e1c6ce55f47d6f4d6fa93970f752ec (patch) | |
| tree | 9f77409bc00ee67483e0e197d2c38e60ff24e22a /libgfortran/intrinsics | |
| parent | 142b99a8888ddb6d67e74b63789983e804b5a732 (diff) | |
re PR libfortran/79956 (many new -Wmaybe-uninitialized warnings with bootstrap-O3)
2017-03-15 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/79956
* libgfortran.h (GFC_ASSERT): New macro.
* m4/reshape.m4 (reshape_'rtype_ccode`): Use GFC_ASSERT
to specify that sdim > 0 and rdim > 0.
* intrinsic/reshape_generic.c (reshape_internal): Likweise.
* 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: r246153
Diffstat (limited to 'libgfortran/intrinsics')
| -rw-r--r-- | libgfortran/intrinsics/reshape_generic.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libgfortran/intrinsics/reshape_generic.c b/libgfortran/intrinsics/reshape_generic.c index 43a822f87ae..09b0c36169b 100644 --- a/libgfortran/intrinsics/reshape_generic.c +++ b/libgfortran/intrinsics/reshape_generic.c @@ -66,6 +66,10 @@ reshape_internal (parray *ret, parray *source, shape_type *shape, index_type shape_data[GFC_MAX_DIMENSIONS]; rdim = GFC_DESCRIPTOR_EXTENT(shape,0); + /* rdim is always > 0; this lets the compiler optimize more and + avoids a warning. */ + GFC_ASSERT (rdim > 0); + if (rdim != GFC_DESCRIPTOR_RANK(ret)) runtime_error("rank of return array incorrect in RESHAPE intrinsic"); @@ -158,6 +162,10 @@ reshape_internal (parray *ret, parray *source, shape_type *shape, source_extent = 1; sdim = GFC_DESCRIPTOR_RANK (source); + /* sdim is always > 0; this lets the compiler optimize more and + avoids a warning. */ + GFC_ASSERT(sdim>0); + for (n = 0; n < sdim; n++) { index_type se; @@ -219,6 +227,10 @@ reshape_internal (parray *ret, parray *source, shape_type *shape, } sdim = GFC_DESCRIPTOR_RANK (source); + /* sdim is always > 0; this lets the compiler optimize more and + avoids a warning. */ + GFC_ASSERT(sdim>0); + ssize = 1; sempty = 0; for (n = 0; n < sdim; n++) |