Changeset 273153 in webkit

Timestamp:

Feb 19, 2021 11:38:57 AM (3 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Do not use toObject for options in new Intl constructors
​https://bugs.webkit.org/show_bug.cgi?id=222164

Reviewed by Alexey Shvayka.

JSTests:

• stress/intl-get-options-not-using-toobject.js: Added.

(shouldThrow):

Source/JavaScriptCore:

New spec change[1] introduced stricter GetOptionsObject for relatively new Intl constructors: Intl.DisplayNames, Intl.ListFormat, and Intl.Segmenter[2].
This does not perform ToObject, and instead,

1. If the input is an undefined, then it returns empty object.
2. If the input is an object, then it returns this object.
3. Otherwise, throwing a TypeError.

This patch implements it.

[1]: ​https://github.com/tc39/ecma402/pull/538
[2]: ​https://github.com/tc39/proposal-intl-segmenter/issues/132

• runtime/IntlDisplayNames.cpp:

(JSC::IntlDisplayNames::initializeDisplayNames):

• runtime/IntlListFormat.cpp:

(JSC::IntlListFormat::initializeListFormat):

• runtime/IntlObjectInlines.h:

(JSC::intlGetOptionsObject):

• runtime/IntlSegmenter.cpp:

(JSC::IntlSegmenter::initializeSegmenter):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/intl-displaynames.js (modified) (1 diff)
• JSTests/stress/intl-get-options-not-using-toobject.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/IntlDisplayNames.cpp (modified) (1 diff)
• Source/JavaScriptCore/runtime/IntlListFormat.cpp (modified) (1 diff)
• Source/JavaScriptCore/runtime/IntlObjectInlines.h (modified) (2 diffs)
• Source/JavaScriptCore/runtime/IntlSegmenter.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2021-02-19  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Do not use toObject for options in new Intl constructors
+        https://bugs.webkit.org/show_bug.cgi?id=222164
+
+        Reviewed by Alexey Shvayka.
+
+        * stress/intl-get-options-not-using-toobject.js: Added.
+        (shouldThrow):
+
 2021-02-19  Caio Lima  <ticaiolima@gmail.com>
 

trunk/JSTests/stress/intl-displaynames.js

@@ -22 +22 @@
 if ($vm.icuVersion() >= 61) {
     shouldBe(Intl.DisplayNames.length, 2);
-    shouldThrow(() => new Intl.DisplayNames, `TypeError: undefined is not an object (evaluating 'new Intl.DisplayNames')`);
+    shouldThrow(() => new Intl.DisplayNames, `TypeError: type must not be undefined`);
 
     // Get display names of region in English

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-02-19  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Do not use toObject for options in new Intl constructors
+        https://bugs.webkit.org/show_bug.cgi?id=222164
+
+        Reviewed by Alexey Shvayka.
+
+        New spec change[1] introduced stricter GetOptionsObject for relatively new Intl constructors: Intl.DisplayNames, Intl.ListFormat, and Intl.Segmenter[2].
+        This does not perform `ToObject`, and instead,
+
+            1. If the input is an undefined, then it returns empty object.
+            2. If the input is an object, then it returns this object.
+            3. Otherwise, throwing a TypeError.
+
+        This patch implements it.
+
+        [1]: https://github.com/tc39/ecma402/pull/538
+        [2]: https://github.com/tc39/proposal-intl-segmenter/issues/132
+
+        * runtime/IntlDisplayNames.cpp:
+        (JSC::IntlDisplayNames::initializeDisplayNames):
+        * runtime/IntlListFormat.cpp:
+        (JSC::IntlListFormat::initializeListFormat):
+        * runtime/IntlObjectInlines.h:
+        (JSC::intlGetOptionsObject):
+        * runtime/IntlSegmenter.cpp:
+        (JSC::IntlSegmenter::initializeSegmenter):
+
 2021-02-19  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/runtime/IntlDisplayNames.cpp

@@ -70 +70 @@
     RETURN_IF_EXCEPTION(scope, void());
 
-    JSObject* options = optionsValue.toObject(globalObject);
+    JSObject* options = intlGetOptionsObject(globalObject, optionsValue);
     RETURN_IF_EXCEPTION(scope, void());
 

trunk/Source/JavaScriptCore/runtime/IntlListFormat.cpp

@@ -92 +92 @@
     RETURN_IF_EXCEPTION(scope, void());
 
-    JSObject* options;
-    if (optionsValue.isUndefined())
-        options = constructEmptyObject(vm, globalObject->nullPrototypeObjectStructure());
-    else {
-        options = optionsValue.toObject(globalObject);
-        RETURN_IF_EXCEPTION(scope, void());
-    }
+    JSObject* options = intlGetOptionsObject(globalObject, optionsValue);
+    RETURN_IF_EXCEPTION(scope, void());
 
     ResolveLocaleOptions localeOptions;

trunk/Source/JavaScriptCore/runtime/IntlObjectInlines.h

@@ -31 +31 @@
 #include "JSBoundFunction.h"
 #include "JSObject.h"
+#include "ObjectConstructor.h"
 #include <unicode/ucol.h>
 
@@ -181 +182 @@
 }
 
+// https://tc39.es/ecma402/#sec-getoptionsobject
+inline JSObject* intlGetOptionsObject(JSGlobalObject* globalObject, JSValue options)
+{
+    VM& vm = globalObject->vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+    if (options.isUndefined())
+        return constructEmptyObject(vm, globalObject->nullPrototypeObjectStructure());
+    if (LIKELY(options.isObject()))
+        return asObject(options);
+    throwTypeError(globalObject, scope, "options argument is not an object or undefined"_s);
+    return nullptr;
+}
+
 } // namespace JSC

trunk/Source/JavaScriptCore/runtime/IntlSegmenter.cpp

@@ -68 +68 @@
     RETURN_IF_EXCEPTION(scope, void());
 
-    JSObject* options;
-    if (optionsValue.isUndefined())
-        options = constructEmptyObject(vm, globalObject->nullPrototypeObjectStructure());
-    else {
-        options = optionsValue.toObject(globalObject);
-        RETURN_IF_EXCEPTION(scope, void());
-    }
+    JSObject* options = intlGetOptionsObject(globalObject, optionsValue);
+    RETURN_IF_EXCEPTION(scope, void());
 
     ResolveLocaleOptions localeOptions;