summaryrefslogtreecommitdiff
path: root/locale/categories.def
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@systemhalted.org>2015-10-08 16:34:53 -0400
committerCarlos O'Donell <carlos@systemhalted.org>2015-10-08 16:41:45 -0400
commit87701a58e291bd7ac3b407d10a829dac52c9c16e (patch)
tree885857388aaeb1248850629cc2a2de40dc2472b2 /locale/categories.def
parentfd91891a5091b5f54680180dc0c8e91827f63c70 (diff)
downloadglibc-87701a58e291bd7ac3b407d10a829dac52c9c16e.tar.gz
strcoll: Remove incorrect STRDIFF-based optimization (Bug 18589).
The optimization introduced in commit f13c2a8dff2329c6692a80176262ceaaf8a6f74e, causes regressions in sorting for languages that have digraphs that change sort order, like cs_CZ which sorts ch between h and i. My analysis shows the fast-forwarding optimization in STRCOLL advances through a digraph while possibly stopping in the middle which results in a subsequent skipping of the digraph and incorrect sorting. The optimization is incorrect as implemented and because of that I'm removing it for 2.23, and I will also commit this fix for 2.22 where it was originally introduced. This patch reverts the optimization, introduces a new bug-strcoll2.c regression test that tests both cs_CZ.UTF-8 and da_DK.ISO-8859-1 and ensures they sort one digraph each correctly. The optimization can't be applied without regressing this test. Checked on x86_64, bug-strcoll2.c fails without this patch and passes after. This will also get a fix on 2.22 which has the same bug.
Diffstat (limited to 'locale/categories.def')
-rw-r--r--locale/categories.def1
1 files changed, 0 insertions, 1 deletions
diff --git a/locale/categories.def b/locale/categories.def
index 045489d741..a8dda53007 100644
--- a/locale/categories.def
+++ b/locale/categories.def
@@ -58,7 +58,6 @@ DEFINE_CATEGORY
DEFINE_ELEMENT (_NL_COLLATE_COLLSEQMB, "collate-collseqmb", std, wstring)
DEFINE_ELEMENT (_NL_COLLATE_COLLSEQWC, "collate-collseqwc", std, wstring)
DEFINE_ELEMENT (_NL_COLLATE_CODESET, "collate-codeset", std, string)
- DEFINE_ELEMENT (_NL_COLLATE_ENCODING_TYPE, "collate-encoding-type", std, word)
), NO_POSTLOAD)