This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] __builtin_expect cleanup for iconvdata/*.c
- From: Kalle Olavi Niemitalo <kon at iki dot fi>
- To: libc-alpha <libc-alpha at sourceware dot org>
- Date: Tue, 09 Sep 2014 00:04:42 +0300
- Subject: Re: [PATCH] __builtin_expect cleanup for iconvdata/*.c
- Authentication-results: sourceware.org; auth=none
- References: <540E06B0 dot 50406 at redhat dot com>
Florian Weimer <fweimer@redhat.com> writes:
> --- a/iconvdata/iso-2022-cn.c
> +++ b/iconvdata/iso-2022-cn.c
> @@ -126,22 +126,22 @@ enum
> STANDARD_FROM_LOOP_ERR_HANDLER (1); \
> \
> /* Recognize escape sequences. */ \
> - if (__builtin_expect (ch, 0) == ESC) \
> + if (__glibc_unlikely (ch) == ESC) \
Shouldn't that be __glibc_unlikely (ch == ESC)?
I guess it makes no difference in practice, but it looks wrong.
There are other changes like that, for example:
- if (__builtin_expect (found, 1) != __UNKNOWN_10646_CHAR) \
+ if (__glibc_likely (found) != __UNKNOWN_10646_CHAR) \