Changeset 245869 in webkit

Timestamp:

May 29, 2019, 2:28:09 PM (7 years ago)

Author:

dino@apple.com

Message:

Implement Promise.allSettled
​https://bugs.webkit.org/show_bug.cgi?id=197600
<rdar://problem/50483885>

Reviewed by Keith Miller.

JSTests:

Start testing Promise.allSettled. We pass most of the tests.
The ones that fail are similar to the Promise.all tests we already fail.

• test262/config.yaml: Remove Promise.allSettled from skipped tests.
• test262/expectations.yaml: Add new expectations for allSettled tests.

Source/JavaScriptCore:

Implement Promise.allSettled
​https://github.com/tc39/proposal-promise-allSettled/

Shipping in Firefox since version 68.
Shipping in V8 since ​https://chromium.googlesource.com/v8/v8.git/+/1f6d27e8df819b448712dface6ad367fb8de426b

• builtins/PromiseConstructor.js:

(allSettled.newResolveRejectElements.resolveElement):
(allSettled.newResolveRejectElements.rejectElement):
(allSettled.newResolveRejectElements):
(allSettled): Added.

• runtime/JSPromiseConstructor.cpp: Add ref to allSettled.

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/test262/config.yaml (modified) (1 diff)
• JSTests/test262/expectations.yaml (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/builtins/PromiseConstructor.js (modified) (1 diff)
• Source/JavaScriptCore/runtime/JSPromiseConstructor.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2019-05-28  Dean Jackson  <dino@apple.com>
+
+        Implement Promise.allSettled
+        https://bugs.webkit.org/show_bug.cgi?id=197600
+        <rdar://problem/50483885>
+
+        Reviewed by Keith Miller.
+
+        Start testing Promise.allSettled. We pass most of the tests.
+        The ones that fail are similar to the Promise.all tests we already fail.
+
+        * test262/config.yaml: Remove Promise.allSettled from skipped tests.
+        * test262/expectations.yaml: Add new expectations for allSettled tests.
+
 2019-05-28  Michael Saboff  <msaboff@apple.com>
 

trunk/JSTests/test262/config.yaml

@@ -32 +32 @@
     - Intl.RelativeTimeFormat
     - Intl.Segmenter
-    # https://bugs.webkit.org/show_bug.cgi?id=196332
-    - Promise.allSettled
   files:
     - test/built-ins/Array/prototype/reverse/length-exceeding-integer-limit-with-object.js

trunk/JSTests/test262/expectations.yaml

@@ -1087 +1087 @@
   default: 'Test262Error: Got `resolve` only once for each iterated value Expected SameValue(«4», «1») to be true'
   strict mode: 'Test262Error: Got `resolve` only once for each iterated value Expected SameValue(«4», «1») to be true'
+test/built-ins/Promise/all/invoke-resolve-get-once-no-calls.js:
+  default: 'Test262Error: Got `resolve` only once for each iterated value Expected SameValue(«0», «1») to be true'
+  strict mode: 'Test262Error: Got `resolve` only once for each iterated value Expected SameValue(«0», «1») to be true'
 test/built-ins/Promise/all/resolve-element-function-nonconstructor.js:
+  default: 'Test262Error: Expected a TypeError to be thrown but no exception was thrown at all'
+  strict mode: 'Test262Error: Expected a TypeError to be thrown but no exception was thrown at all'
+test/built-ins/Promise/allSettled/invoke-resolve-get-error-close.js:
+  default: 'Test262Error: Expected SameValue(«1», «0») to be true'
+  strict mode: 'Test262Error: Expected SameValue(«1», «0») to be true'
+test/built-ins/Promise/allSettled/invoke-resolve-get-once-multiple-calls.js:
+  default: 'Test262Error: Got `resolve` only once for each iterated value Expected SameValue(«4», «1») to be true'
+  strict mode: 'Test262Error: Got `resolve` only once for each iterated value Expected SameValue(«4», «1») to be true'
+test/built-ins/Promise/allSettled/invoke-resolve-get-once-no-calls.js:
+  default: 'Test262Error: Got `resolve` only once for each iterated value Expected SameValue(«0», «1») to be true'
+  strict mode: 'Test262Error: Got `resolve` only once for each iterated value Expected SameValue(«0», «1») to be true'
+test/built-ins/Promise/allSettled/reject-element-function-nonconstructor.js:
+  default: 'Test262Error: Expected a TypeError to be thrown but no exception was thrown at all'
+  strict mode: 'Test262Error: Expected a TypeError to be thrown but no exception was thrown at all'
+test/built-ins/Promise/allSettled/resolve-element-function-nonconstructor.js:
   default: 'Test262Error: Expected a TypeError to be thrown but no exception was thrown at all'
   strict mode: 'Test262Error: Expected a TypeError to be thrown but no exception was thrown at all'

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-05-28  Dean Jackson  <dino@apple.com>
+
+        Implement Promise.allSettled
+        https://bugs.webkit.org/show_bug.cgi?id=197600
+        <rdar://problem/50483885>
+
+        Reviewed by Keith Miller.
+
+        Implement Promise.allSettled
+        https://github.com/tc39/proposal-promise-allSettled/
+
+        Shipping in Firefox since version 68.
+        Shipping in V8 since https://chromium.googlesource.com/v8/v8.git/+/1f6d27e8df819b448712dface6ad367fb8de426b
+
+        * builtins/PromiseConstructor.js:
+        (allSettled.newResolveRejectElements.resolveElement):
+        (allSettled.newResolveRejectElements.rejectElement):
+        (allSettled.newResolveRejectElements):
+        (allSettled): Added.
+        * runtime/JSPromiseConstructor.cpp: Add ref to allSettled.
+
 2019-05-28  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/builtins/PromiseConstructor.js

@@ -76 +76 @@
 }
 
+function allSettled(iterable)
+{
+    "use strict";
+
+    if (!@isObject(this))
+        @throwTypeError("|this| is not a object");
+
+    var promiseCapability = @newPromiseCapability(this);
+
+    var values = [];
+    var remainingElementsCount = 1;
+    var index = 0;
+
+    function newResolveRejectElements(index)
+    {
+        var alreadyCalled = false;
+
+        var resolveElement = function @resolve(x)
+        {
+            if (alreadyCalled)
+                return @undefined;
+            alreadyCalled = true;
+
+            var obj = {
+                status: "fulfilled",
+                value: x
+            };
+
+            @putByValDirect(values, index, obj);
+
+            --remainingElementsCount;
+            if (remainingElementsCount === 0)
+                return promiseCapability.@resolve.@call(@undefined, values);
+
+            return @undefined;
+        };
+
+        var rejectElement = function @reject(x)
+        {
+            if (alreadyCalled)
+                return @undefined;
+            alreadyCalled = true;
+
+            var obj = {
+                status: "rejected",
+                reason: x
+            };
+
+            @putByValDirect(values, index, obj);
+
+            --remainingElementsCount;
+            if (remainingElementsCount === 0)
+                return promiseCapability.@resolve.@call(@undefined, values);
+
+            return @undefined;
+        };
+
+        return [resolveElement, rejectElement];
+    }
+
+    try {
+        for (var value of iterable) {
+            @putByValDirect(values, index, @undefined);
+            var nextPromise = this.resolve(value);
+            var [resolveElement, rejectElement] = newResolveRejectElements(index);
+            ++remainingElementsCount;
+            nextPromise.then(resolveElement, rejectElement);
+            ++index;
+        }
+
+        --remainingElementsCount;
+        if (remainingElementsCount === 0)
+            promiseCapability.@resolve.@call(@undefined, values);
+    } catch (error) {
+        promiseCapability.@reject.@call(@undefined, error);
+    }
+
+    return promiseCapability.@promise;
+}
+
 function race(iterable)
 {

trunk/Source/JavaScriptCore/runtime/JSPromiseConstructor.cpp

@@ -58 +58 @@
   race            JSBuiltin             DontEnum|Function 1
   all             JSBuiltin             DontEnum|Function 1
+  allSettled      JSBuiltin             DontEnum|Function 1
 @end
 */