Changeset 282897 in webkit

Timestamp:

Sep 22, 2021 5:39:19 PM (10 months ago)

Author:

ysuzuki@apple.com

Message:

[JSC] emoji and eor collations are missing
​https://bugs.webkit.org/show_bug.cgi?id=230652

Reviewed by Ross Kirsling.

JSTests:

• stress/intl-enumeration.js:
• test262/expectations.yaml:

Source/JavaScriptCore:

Due to ICU's bug, "emoji" and "eor" collations are missing from enumeration.
This patch adds work-around for this.

• runtime/IntlObject.cpp:

(JSC::availableCollations):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/intl-enumeration.js (modified) (1 diff)
• JSTests/test262/expectations.yaml (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/IntlObject.cpp (modified) (2 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2021-09-22  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] emoji and eor collations are missing
+        https://bugs.webkit.org/show_bug.cgi?id=230652
+
+        Reviewed by Ross Kirsling.
+
+        * stress/intl-enumeration.js:
+        * test262/expectations.yaml:
+
 2021-09-22  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/JSTests/stress/intl-enumeration.js

@@ -20 +20 @@
 
 let collations = Intl.supportedValuesOf("collation");
-shouldBe(JSON.stringify(collations), `["big5han","compat","dict","gb2312","phonebk","phonetic","pinyin","reformed","searchjl","stroke","trad","unihan","zhuyin"]`);
+shouldBe(JSON.stringify(collations), `["big5han","compat","dict","emoji","eor","gb2312","phonebk","phonetic","pinyin","reformed","searchjl","stroke","trad","unihan","zhuyin"]`);
 
 let currencies = Intl.supportedValuesOf("currency");

trunk/JSTests/test262/expectations.yaml

@@ -850 +850 @@
   default: 'Test262Error: Expected SameValue(«und-NO-u-sd-no23», «und-NO-u-sd-no50») to be true'
   strict mode: 'Test262Error: Expected SameValue(«und-NO-u-sd-no23», «und-NO-u-sd-no50») to be true'
-test/intl402/Intl/supportedValuesOf/collations-accepted-by-Collator.js:
-  default: 'Test262Error: emoji supported but not returned by supportedValuesOf'
-  strict mode: 'Test262Error: emoji supported but not returned by supportedValuesOf'
 test/intl402/Intl/supportedValuesOf/currencies-accepted-by-DisplayNames.js:
   default: 'Test262Error: ADP supported but not returned by supportedValuesOf'

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-09-22  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] emoji and eor collations are missing
+        https://bugs.webkit.org/show_bug.cgi?id=230652
+
+        Reviewed by Ross Kirsling.
+
+        Due to ICU's bug, "emoji" and "eor" collations are missing from enumeration.
+        This patch adds work-around for this.
+
+        * runtime/IntlObject.cpp:
+        (JSC::availableCollations):
+
 2021-09-22  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/runtime/IntlObject.cpp

@@ -1658 +1658 @@
 
     Vector<String, 1> elements;
-    elements.reserveInitialCapacity(count);
+    elements.reserveInitialCapacity(count + 2);
+    // ICU ~69 has a bug that does not report "emoji" and "eor" for collation when using ucol_getKeywordValues.
+    // https://github.com/unicode-org/icu/commit/24778dfc9bf67f431509361a173a33a1ab860b5d
+    elements.append("emoji"_s);
+    elements.append("eor"_s);
     for (int32_t index = 0; index < count; ++index) {
         int32_t length = 0;
@@ -1681 +1685 @@
             return WTF::codePointCompare(a, b) < 0;
         });
+    auto end = std::unique(elements.begin(), elements.end());
+    elements.resize(elements.size() - (elements.end() - end));
 
     RELEASE_AND_RETURN(scope, createArrayFromStringVector(globalObject, WTFMove(elements)));