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

re PR libfortran/79956 (many new -Wmaybe-uninitialized warnings with bootstrap-O3)

Browse Source 
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
This commit is contained in:
Thomas Koenig 2017-03-15 07:45:39 +00:00
parent 142b99a888
commit 20305b5047
15 changed files with 144 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libgfortran/ChangeLog
View File

@ -1,3 +1,22 @@
2017-03-10 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.
2017-03-11 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/78854

9
libgfortran/generated/reshape_c10.c
View File

@ -78,6 +78,10 @@ reshape_c10 (gfc_array_c10 * const restrict ret,
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 potential warning. */
GFC_ASSERT(sdim>0);
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
@ -232,6 +236,11 @@ reshape_c10 (gfc_array_c10 * const restrict ret,
}
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++)

9
libgfortran/generated/reshape_c16.c
View File

@ -78,6 +78,10 @@ reshape_c16 (gfc_array_c16 * const restrict ret,
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 potential warning. */
GFC_ASSERT(sdim>0);
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
@ -232,6 +236,11 @@ reshape_c16 (gfc_array_c16 * const restrict ret,
}
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++)

9
libgfortran/generated/reshape_c4.c
View File

@ -78,6 +78,10 @@ reshape_c4 (gfc_array_c4 * const restrict ret,
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 potential warning. */
GFC_ASSERT(sdim>0);
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
@ -232,6 +236,11 @@ reshape_c4 (gfc_array_c4 * const restrict ret,
}
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++)

9
libgfortran/generated/reshape_c8.c
View File

@ -78,6 +78,10 @@ reshape_c8 (gfc_array_c8 * const restrict ret,
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 potential warning. */
GFC_ASSERT(sdim>0);
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
@ -232,6 +236,11 @@ reshape_c8 (gfc_array_c8 * const restrict ret,
}
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++)

9
libgfortran/generated/reshape_i16.c
View File

@ -78,6 +78,10 @@ reshape_16 (gfc_array_i16 * const restrict ret,
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 potential warning. */
GFC_ASSERT(sdim>0);
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
@ -232,6 +236,11 @@ reshape_16 (gfc_array_i16 * const restrict ret,
}
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++)

9
libgfortran/generated/reshape_i4.c
View File

@ -78,6 +78,10 @@ reshape_4 (gfc_array_i4 * const restrict ret,
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 potential warning. */
GFC_ASSERT(sdim>0);
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
@ -232,6 +236,11 @@ reshape_4 (gfc_array_i4 * const restrict ret,
}
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++)

9
libgfortran/generated/reshape_i8.c
View File

@ -78,6 +78,10 @@ reshape_8 (gfc_array_i8 * const restrict ret,
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 potential warning. */
GFC_ASSERT(sdim>0);
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
@ -232,6 +236,11 @@ reshape_8 (gfc_array_i8 * const restrict ret,
}
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++)

9
libgfortran/generated/reshape_r10.c
View File

@ -78,6 +78,10 @@ reshape_r10 (gfc_array_r10 * const restrict ret,
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 potential warning. */
GFC_ASSERT(sdim>0);
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
@ -232,6 +236,11 @@ reshape_r10 (gfc_array_r10 * const restrict ret,
}
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++)

9
libgfortran/generated/reshape_r16.c
View File

@ -78,6 +78,10 @@ reshape_r16 (gfc_array_r16 * const restrict ret,
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 potential warning. */
GFC_ASSERT(sdim>0);
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
@ -232,6 +236,11 @@ reshape_r16 (gfc_array_r16 * const restrict ret,
}
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++)

9
libgfortran/generated/reshape_r4.c
View File

@ -78,6 +78,10 @@ reshape_r4 (gfc_array_r4 * const restrict ret,
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 potential warning. */
GFC_ASSERT(sdim>0);
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
@ -232,6 +236,11 @@ reshape_r4 (gfc_array_r4 * const restrict ret,
}
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++)

9
libgfortran/generated/reshape_r8.c
View File

@ -78,6 +78,10 @@ reshape_r8 (gfc_array_r8 * const restrict ret,
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 potential warning. */
GFC_ASSERT(sdim>0);
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
@ -232,6 +236,11 @@ reshape_r8 (gfc_array_r8 * const restrict ret,
}
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++)

12
libgfortran/intrinsics/reshape_generic.c
View File

@ -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++)

5
libgfortran/libgfortran.h
View File

@ -111,6 +111,11 @@ typedef off_t gfc_offset;
#define likely(x) __builtin_expect(!!(x), 1)
#define unlikely(x) __builtin_expect(!!(x), 0)
/* This macro can be used to annotate conditions which we know to
be true, so that the compiler can optimize based on the condition. */
#define GFC_ASSERT(EXPR) \
((void)(__builtin_expect (!(EXPR), 0) ? __builtin_unreachable (), 0 : 0))
/* Make sure we have ptrdiff_t. */
#ifndef HAVE_PTRDIFF_T

9
libgfortran/m4/reshape.m4
View File

@ -82,6 +82,10 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret,
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 potential warning. */
GFC_ASSERT(sdim>0);
if (rdim != GFC_DESCRIPTOR_RANK(ret))
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
@ -236,6 +240,11 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret,
}
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++)