diff options
| author | Karl Williamson <public@khwilliamson.com> | 2012-04-28 19:25:40 -0600 |
|---|---|---|
| committer | Karl Williamson <public@khwilliamson.com> | 2012-05-22 08:24:19 -0600 |
| commit | b5b9af0457bb04d28735caf08eed046293cf4d94 (patch) | |
| tree | b8c7a762e063798b1b07ee49d77847f2eab1df04 /utf8.c | |
| parent | 35c86e19f5a1e48c101194252134fd12094c82ba (diff) | |
| download | perl-b5b9af0457bb04d28735caf08eed046293cf4d94.tar.gz | |
utf8n_to_uvuni(): Add a few compiler hints
Tell the compiler that malformed input is not likely, so it can optimize
accordingly.
Diffstat (limited to 'utf8.c')
| -rw-r--r-- | utf8.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -590,7 +590,7 @@ Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) * sequence and process the rest, inappropriately */ /* Zero length strings, if allowed, of necessity are zero */ - if (curlen == 0) { + if (UNLIKELY(curlen == 0)) { if (retlen) { *retlen = 0; } @@ -620,7 +620,7 @@ Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) } /* A continuation character can't start a valid sequence */ - if (UTF8_IS_CONTINUATION(uv)) { + if (UNLIKELY(UTF8_IS_CONTINUATION(uv))) { if (flags & UTF8_ALLOW_CONTINUATION) { if (retlen) { *retlen = 1; @@ -653,7 +653,7 @@ Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) send = (U8*) s0 + ((expectlen <= curlen) ? expectlen : curlen); for (s = s0 + 1; s < send; s++) { - if (UTF8_IS_CONTINUATION(*s)) { + if (LIKELY(UTF8_IS_CONTINUATION(*s))) { #ifndef EBCDIC /* Can't overflow in EBCDIC */ if (uv & UTF_ACCUMULATION_OVERFLOW_MASK) { @@ -698,7 +698,7 @@ Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) * ones are present. I don't know of any real reason to prefer one over * the other, except that it seems to me that multiple-byte errors trumps * errors from a single byte */ - if (unexpected_non_continuation) { + if (UNLIKELY(unexpected_non_continuation)) { if (!(flags & UTF8_ALLOW_NON_CONTINUATION)) { if (! (flags & UTF8_CHECK_ONLY)) { if (curlen == 1) { @@ -719,7 +719,7 @@ Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) *retlen = curlen; } } - else if (curlen < expectlen) { + else if (UNLIKELY(curlen < expectlen)) { if (! (flags & UTF8_ALLOW_SHORT)) { if (! (flags & UTF8_CHECK_ONLY)) { sv = sv_2mortal(Perl_newSVpvf(aTHX_ "%s (%d byte%s, need %d, after start byte 0x%02x)", malformed_text, (int)curlen, curlen == 1 ? "" : "s", (int)expectlen, *s0)); @@ -749,7 +749,7 @@ Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) goto malformed; } } - if (overflowed) { + if (UNLIKELY(overflowed)) { /* If the first byte is FF, it will overflow a 32-bit word. If the * first byte is FE, it will overflow a signed 32-bit word. The |