public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Joseph Myers <jsm28@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] Fix iconv build with GCC mainline Date: Mon, 23 Aug 2021 16:18:56 +0000 (GMT) [thread overview] Message-ID: <20210823161856.659BE3858C2C@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c8126360dfa98024cc40bce915e126309993cdf9 commit c8126360dfa98024cc40bce915e126309993cdf9 Author: Joseph Myers <joseph@codesourcery.com> Date: Mon Aug 23 16:18:42 2021 +0000 Fix iconv build with GCC mainline Current GCC mainline produces -Wstringop-overflow errors building some iconv converters, as discussed at <https://gcc.gnu.org/pipermail/gcc/2021-July/236943.html>. Add an __builtin_unreachable call as suggested so that GCC can see the case that would involve a buffer overflow is unreachable; because the unreachability depends on valid conversion state being passed into the function from previous conversion steps, it's not something the compiler can reasonably deduce on its own. Tested with build-many-glibcs.py that, together with <https://sourceware.org/pipermail/libc-alpha/2021-August/130244.html>, it restores the glibc build for powerpc-linux-gnu. Diff: --- iconv/loop.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/iconv/loop.c b/iconv/loop.c index 062cc1b868..560a5f6394 100644 --- a/iconv/loop.c +++ b/iconv/loop.c @@ -436,6 +436,12 @@ SINGLE(LOOPFCT) (struct __gconv_step *step, return __GCONV_FULL_OUTPUT; /* Now add characters from the normal input buffer. */ + if (inlen >= MAX_NEEDED_INPUT) + /* Avoid a -Wstringop-overflow= warning when this loop is + unrolled. The compiler cannot otherwise see that this is + unreachable because it depends on (state->__count & 7) not + being too large after a previous conversion step. */ + __builtin_unreachable (); do bytebuf[inlen++] = *inptr++; while (inlen < MAX_NEEDED_INPUT && inptr < inend);
reply other threads:[~2021-08-23 16:18 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210823161856.659BE3858C2C@sourceware.org \ --to=jsm28@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).