lib/glibc
lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-05-28 16:21:30 +03:00
Code

Fix two more -Os strcoll / wcscoll build failures.

Browse Source 
Continuing fixes for -Os build issues shown with build-many-glibcs.py,
this patch adds uses of DIAG_* to disable -Wmaybe-uninitialized in two
more places where code inlined from strcoll / wcscoll is wrongly
diagnosed as possibly using uninitialized structure fields.  (All
these warnings in different places for these functions are I think
essentially the same bug.)

Tested with build-many-glibcs.py for alpha-linux-gnu and
mips-linux-gnu that this fixes the -Os build failures for those
configurations with GCC 7.

	* locale/weightwc.h (findidx): Ignore -Wmaybe-uninitialized for
	-Os in two more places.
This commit is contained in:
Joseph Myers 2018-02-27 16:54:14 +00:00
parent 874c56d797
commit 02f2fead8f
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2018-02-27 Joseph Myers <joseph@codesourcery.com>
* locale/weightwc.h (findidx): Ignore -Wmaybe-uninitialized for
-Os in two more places.
2018-02-27 Mike FABIAN <mfabian@redhat.com> 2018-02-27 Mike FABIAN <mfabian@redhat.com>
See this bug https://sourceware.org/bugzilla/show_bug.cgi?id=22898 See this bug https://sourceware.org/bugzilla/show_bug.cgi?id=22898

15
locale/weightwc.h
View File

@ -28,7 +28,15 @@ findidx (const int32_t *table,
const wint_t *extra, const wint_t *extra,
const wint_t **cpp, size_t len) const wint_t **cpp, size_t len)
{ {
/* With GCC 7 when compiling with -Os the compiler warns that
seq1.back_us and seq2.back_us, which become *cpp, might be used
uninitialized. This is impossible as this function cannot be
called except in cases where those fields have been
initialized. */
DIAG_PUSH_NEEDS_COMMENT;
DIAG_IGNORE_Os_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
wint_t ch = *(*cpp)++; wint_t ch = *(*cpp)++;
DIAG_POP_NEEDS_COMMENT;
int32_t i = __collidx_table_lookup ((const char *) table, ch); int32_t i = __collidx_table_lookup ((const char *) table, ch);
if (i >= 0) if (i >= 0)
@ -107,11 +115,18 @@ findidx (const int32_t *table,
continue; continue;
} }
/* With GCC 7 when compiling with -Os the compiler warns
that seq1.back_us and seq2.back_us, which become usrc,
might be used uninitialized. This is impossible for the
same reason as described above. */
DIAG_PUSH_NEEDS_COMMENT;
DIAG_IGNORE_Os_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
if (cp[nhere - 1] > usrc[nhere -1]) if (cp[nhere - 1] > usrc[nhere -1])
{ {
cp += 2 * nhere; cp += 2 * nhere;
continue; continue;
} }
DIAG_POP_NEEDS_COMMENT;
if (cp[2 * nhere - 1] < usrc[nhere -1]) if (cp[2 * nhere - 1] < usrc[nhere -1])
{ {