Changeset 287560 in webkit

Timestamp:

Jan 3, 2022 9:12:15 PM (7 months ago)

Author:

ysuzuki@apple.com

Message:

Array.prototype.toLocaleString does not respect deletion of Object.prototype.toLocaleString
​https://bugs.webkit.org/show_bug.cgi?id=232723

Reviewed by Alexey Shvayka.

JSTests:

• ChakraCore/test/Array/toLocaleString.baseline-jsc:
• stress/array-tolocalestring-delete-tolocalestring.js: Added.

(shouldThrow):

• stress/array-tolocalestring-empty-separator.js: Added.

(shouldBe):

• stress/array-tolocalestring-options.js: Added.

(shouldBe):

• stress/array-tolocalestring-undefined-null.js: Added.

(shouldBe):
(shouldBe.toLocaleString):

Source/JavaScriptCore:

This patch implements ECMA402 Array.prototype.toLocaleString[1]. The new implementation invokes "toLocaleString"
method for each elements.

[1]: ​https://tc39.es/ecma402/#sup-array.prototype.tolocalestring

• runtime/ArrayPrototype.cpp:

(JSC::toLocaleString):
(JSC::JSC_DEFINE_HOST_FUNCTION):
(JSC::slowJoin):

Location:

trunk

Files:

• JSTests/ChakraCore/test/Array/toLocaleString.baseline-jsc (modified) (2 diffs)
• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/array-tolocalestring-delete-tolocalestring.js (added)
• JSTests/stress/array-tolocalestring-empty-separator.js (added)
• JSTests/stress/array-tolocalestring-options.js (added)
• JSTests/stress/array-tolocalestring-undefined-null.js (added)
• LayoutTests/js/dom/script-tests/toString-overrides.js (modified) (1 diff)
• LayoutTests/js/dom/toString-overrides-expected.txt (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/ArrayPrototype.cpp (modified) (4 diffs)

trunk/JSTests/ChakraCore/test/Array/toLocaleString.baseline-jsc

@@ -19 +19 @@
 
 3. Array: element toLocaleString not callable
-0,[object Object]
+TypeError : toLocaleString is not callable
 
 
@@ -31 +31 @@
 
 6. Object: element toLocaleString not callable
-0,[object Object]
+TypeError : toLocaleString is not callable
 
 

trunk/JSTests/ChangeLog

@@ +1 @@
+2022-01-03  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        Array.prototype.toLocaleString does not respect deletion of Object.prototype.toLocaleString
+        https://bugs.webkit.org/show_bug.cgi?id=232723
+
+        Reviewed by Alexey Shvayka.
+
+        * ChakraCore/test/Array/toLocaleString.baseline-jsc:
+        * stress/array-tolocalestring-delete-tolocalestring.js: Added.
+        (shouldThrow):
+        * stress/array-tolocalestring-empty-separator.js: Added.
+        (shouldBe):
+        * stress/array-tolocalestring-options.js: Added.
+        (shouldBe):
+        * stress/array-tolocalestring-undefined-null.js: Added.
+        (shouldBe):
+        (shouldBe.toLocaleString):
+
 2022-01-03  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/LayoutTests/js/dom/script-tests/toString-overrides.js

@@ -22 +22 @@
 shouldBe("[1].toLocaleString()", "'toLocaleString'");
 Number.prototype.toLocaleString = "invalid";
-shouldBe("[1].toLocaleString()", "'1'");
+shouldThrow("[1].toLocaleString()");
 shouldBe("[/r/].toString()", "'toString2'");
 shouldBe("[/r/].toLocaleString()", "'toLocaleString2'");
 RegExp.prototype.toLocaleString = "invalid";
-shouldBe("[/r/].toLocaleString()", "'toString2'");
+shouldThrow("[/r/].toLocaleString()", "'toString2'");
 
 var caught = false;

trunk/LayoutTests/js/dom/toString-overrides-expected.txt

@@ -6 +6 @@
 PASS [1].toString() is '1'
 PASS [1].toLocaleString() is 'toLocaleString'
-PASS [1].toLocaleString() is '1'
+PASS [1].toLocaleString() threw exception TypeError: toLocaleString is not callable.
 PASS [/r/].toString() is 'toString2'
 PASS [/r/].toLocaleString() is 'toLocaleString2'
-PASS [/r/].toLocaleString() is 'toString2'
+FAIL [/r/].toLocaleString() should throw toString2. Threw exception TypeError: toLocaleString is not callable.
 PASS caught is true
 PASS successfullyParsed is true

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2022-01-03  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        Array.prototype.toLocaleString does not respect deletion of Object.prototype.toLocaleString
+        https://bugs.webkit.org/show_bug.cgi?id=232723
+
+        Reviewed by Alexey Shvayka.
+
+        This patch implements ECMA402 Array.prototype.toLocaleString[1]. The new implementation invokes "toLocaleString"
+        method for each elements.
+
+        [1]: https://tc39.es/ecma402/#sup-array.prototype.tolocalestring
+
+        * runtime/ArrayPrototype.cpp:
+        (JSC::toLocaleString):
+        (JSC::JSC_DEFINE_HOST_FUNCTION):
+        (JSC::slowJoin):
+
 2022-01-03  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp

@@ -677 +677 @@
 }
 
+static JSString* toLocaleString(JSGlobalObject* globalObject, JSValue value, JSValue locales, JSValue options)
+{
+    VM& vm = globalObject->vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
+    JSValue toLocaleStringMethod = value.get(globalObject, vm.propertyNames->toLocaleString);
+    RETURN_IF_EXCEPTION(scope, { });
+
+    auto callData = getCallData(vm, toLocaleStringMethod);
+    if (callData.type == CallData::Type::None) {
+        throwTypeError(globalObject, scope, "toLocaleString is not callable"_s);
+        return { };
+    }
+
+    MarkedArgumentBufferWithSize<2> arguments;
+    arguments.append(locales);
+    arguments.append(options);
+    ASSERT(!arguments.hasOverflowed());
+
+    JSValue result = call(globalObject, toLocaleStringMethod, callData, value, arguments);
+    RETURN_IF_EXCEPTION(scope, { });
+
+    RELEASE_AND_RETURN(scope, result.toString(globalObject));
+}
+
+// https://tc39.es/ecma402/#sup-array.prototype.tolocalestring
 JSC_DEFINE_HOST_FUNCTION(arrayProtoFuncToLocaleString, (JSGlobalObject* globalObject, CallFrame* callFrame))
 {
@@ -683 +709 @@
     JSValue thisValue = callFrame->thisValue().toThis(globalObject, ECMAMode::strict());
 
+    JSValue locales = callFrame->argument(0);
+    JSValue options = callFrame->argument(1);
+
+    // 1. Let array be ? ToObject(this value).
     JSObject* thisObject = thisValue.toObject(globalObject);
-    RETURN_IF_EXCEPTION(scope, encodedJSValue());
-    uint64_t length = static_cast<uint64_t>(toLength(globalObject, thisObject));
-    RETURN_IF_EXCEPTION(scope, encodedJSValue());
-    if (length > std::numeric_limits<unsigned>::max()) {
-        throwOutOfMemoryError(globalObject, scope);
-        return encodedJSValue();
-    }
+    RETURN_IF_EXCEPTION(scope, { });
 
     StringRecursionChecker checker(globalObject, thisObject);
@@ -697 +721 @@
         return JSValue::encode(earlyReturnValue);
 
-    JSStringJoiner stringJoiner(globalObject, ',', static_cast<uint32_t>(length));
-    RETURN_IF_EXCEPTION(scope, encodedJSValue());
-
-    ArgList arguments(callFrame);
-    for (unsigned i = 0; i < length; ++i) {
-        JSValue element = thisObject->getIndex(globalObject, i);
-        RETURN_IF_EXCEPTION(scope, encodedJSValue());
+    // 2. Let len be ? ToLength(? Get(array, "length")).
+    uint64_t length = static_cast<uint64_t>(toLength(globalObject, thisObject));
+    RETURN_IF_EXCEPTION(scope, { });
+
+    // 3. Let separator be the String value for the list-separator String appropriate for
+    // the host environment's current locale (this is derived in an implementation-defined way).
+    const LChar comma = ',';
+    JSString* separator = jsSingleCharacterString(vm, comma);
+
+    // 4. Let R be the empty String.
+    if (!length)
+        return JSValue::encode(jsEmptyString(vm));
+
+    // 5. Let k be 0.
+    JSValue element0 = thisObject->getIndex(globalObject, 0);
+    RETURN_IF_EXCEPTION(scope, { });
+
+    // 6. Repeat, while k < len,
+    // 6.a. If k > 0, then
+    // 6.a.i. Set R to the string-concatenation of R and separator.
+
+    JSString* r = nullptr;
+    if (element0.isUndefinedOrNull())
+        r = jsEmptyString(vm);
+    else {
+        r = toLocaleString(globalObject, element0, locales, options);
+        RETURN_IF_EXCEPTION(scope, { });
+    }
+
+    // 8. Let k be 1.
+    // 9. Repeat, while k < len
+    // 9.e Increase k by 1..
+    for (uint64_t k = 1; k < length; ++k) {
+        // 6.b. Let nextElement be ? Get(array, ! ToString(k)).
+        JSValue element = thisObject->getIndex(globalObject, k);
+        RETURN_IF_EXCEPTION(scope, { });
+
+        // c. If nextElement is not undefined or null, then
+        JSString* next = nullptr;
         if (element.isUndefinedOrNull())
-            element = jsEmptyString(vm);
+            next = jsEmptyString(vm);
         else {
-            JSValue conversionFunction = element.get(globalObject, vm.propertyNames->toLocaleString);
-            RETURN_IF_EXCEPTION(scope, encodedJSValue());
-            auto callData = getCallData(vm, conversionFunction);
-            if (callData.type != CallData::Type::None) {
-                element = call(globalObject, conversionFunction, callData, element, arguments);
-                RETURN_IF_EXCEPTION(scope, encodedJSValue());
-            }
-        }
-        stringJoiner.append(globalObject, element);
-        RETURN_IF_EXCEPTION(scope, encodedJSValue());
-    }
-
-    RELEASE_AND_RETURN(scope, JSValue::encode(stringJoiner.join(globalObject)));
+            // i. Let S be ? ToString(? Invoke(nextElement, "toLocaleString", « locales, options »)).
+            // ii. Set R to the string-concatenation of R and S.
+            next = toLocaleString(globalObject, element, locales, options);
+            RETURN_IF_EXCEPTION(scope, { });
+        }
+
+        // d. Increase k by 1.
+        r = jsString(globalObject, r, separator, next);
+        RETURN_IF_EXCEPTION(scope, { });
+    }
+
+    // 7. Return R.
+    return JSValue::encode(r);
 }
 
@@ -748 +804 @@
     for (uint64_t k = 1; k < length; ++k) {
         // b. Let element be ? Get(O, ! ToString(k)).
-        JSValue element = thisObject->get(globalObject, Identifier::fromString(vm, AtomString::number(k)));
+        JSValue element = thisObject->getIndex(globalObject, k);
         RETURN_IF_EXCEPTION(scope, { });