Changeset 283459 in webkit

Timestamp:

Oct 2, 2021, 7:12:39 PM (5 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Enable Intl.DisplayNames without ICU version check
​https://bugs.webkit.org/show_bug.cgi?id=231122

Reviewed by Ross Kirsling.

Now every port requires ICU 61.2 or later. Since Intl.DisplayNames requires ICU 61, we can enable it without ICU version check.
This simplifies Intl.DisplayNames code.

• runtime/IntlDisplayNames.cpp:

(JSC::IntlDisplayNames::initializeDisplayNames):
(JSC::IntlDisplayNames::of const):

• runtime/IntlDisplayNames.h:
• runtime/IntlObject.cpp:

(JSC::IntlObject::finishCreation):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/IntlDisplayNames.cpp (modified) (4 diffs)
• runtime/IntlDisplayNames.h (modified) (1 diff)
• runtime/IntlObject.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-10-02  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Enable Intl.DisplayNames without ICU version check
+        https://bugs.webkit.org/show_bug.cgi?id=231122
+
+        Reviewed by Ross Kirsling.
+
+        Now every port requires ICU 61.2 or later. Since Intl.DisplayNames requires ICU 61, we can enable it without ICU version check.
+        This simplifies Intl.DisplayNames code.
+
+        * runtime/IntlDisplayNames.cpp:
+        (JSC::IntlDisplayNames::initializeDisplayNames):
+        (JSC::IntlDisplayNames::of const):
+        * runtime/IntlDisplayNames.h:
+        * runtime/IntlObject.cpp:
+        (JSC::IntlObject::finishCreation):
+
 2021-10-02  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/runtime/IntlDisplayNames.cpp

@@ -111 +111 @@
     RETURN_IF_EXCEPTION(scope, void());
 
-#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
     UErrorCode status = U_ZERO_ERROR;
 
@@ -139 +138 @@
         return;
     }
-#else
-    throwTypeError(globalObject, scope, "Failed to initialize Intl.DisplayNames since used feature is not supported in the linked ICU version"_s);
-    return;
-#endif
 }
 
@@ -152 +147 @@
     auto scope = DECLARE_THROW_SCOPE(vm);
 
-#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
     ASSERT(m_displayNames);
     auto code = codeValue.toWTFString(globalObject);
@@ -357 +351 @@
     }
     return jsString(vm, String(buffer));
-#else
-    UNUSED_PARAM(codeValue);
-    throwTypeError(globalObject, scope, "Failed to initialize Intl.DisplayNames since used feature is not supported in the linked ICU version"_s);
-    return { };
-#endif
 }
 

trunk/Source/JavaScriptCore/runtime/IntlDisplayNames.h

@@ -31 +31 @@
 
 namespace JSC {
-
-#if !defined(HAVE_ICU_U_LOCALE_DISPLAY_NAMES)
-// We need 61 or later since part of implementation uses UCURR_NARROW_SYMBOL_NAME.
-#if U_ICU_VERSION_MAJOR_NUM >= 61
-#define HAVE_ICU_U_LOCALE_DISPLAY_NAMES 1
-#endif
-#endif
 
 enum class RelevantExtensionKey : uint8_t;

trunk/Source/JavaScriptCore/runtime/IntlObject.cpp

@@ -154 +154 @@
   Collator              createCollatorConstructor                    DontEnum|PropertyCallback
   DateTimeFormat        createDateTimeFormatConstructor              DontEnum|PropertyCallback
+  DisplayNames          createDisplayNamesConstructor                DontEnum|PropertyCallback
   Locale                createLocaleConstructor                      DontEnum|PropertyCallback
   NumberFormat          createNumberFormatConstructor                DontEnum|PropertyCallback
@@ -239 +240 @@
     ASSERT(inherits(vm, info()));
     JSC_TO_STRING_TAG_WITHOUT_TRANSITION();
-#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
-    putDirectWithoutTransition(vm, vm.propertyNames->DisplayNames, createDisplayNamesConstructor(vm, this), static_cast<unsigned>(PropertyAttribute::DontEnum));
-#else
-    UNUSED_PARAM(&createDisplayNamesConstructor);
-#endif
 #if HAVE(ICU_U_LIST_FORMATTER)
     putDirectWithoutTransition(vm, vm.propertyNames->ListFormat, createListFormatConstructor(vm, this), static_cast<unsigned>(PropertyAttribute::DontEnum));