Changeset 161365 in webkit for trunk/Source/JavaScriptCore/runtime/JSPromiseFunctions.cpp

Timestamp:

Jan 6, 2014, 1:00:03 PM (12 years ago)

Author:

[email protected]

Message:

[JS] Implement Promise.all()
​https://bugs.webkit.org/show_bug.cgi?id=126510

Reviewed by Gavin Barraclough.

Source/JavaScriptCore:

Add Promise.all() implementation and factor out performing resolves and rejects
on deferreds to share a bit of code. Also moves the abruptRejection helper to
JSPromiseDeferred so it can be used in JSPromiseFunctions.

• runtime/CommonIdentifiers.h:
• runtime/JSPromiseConstructor.cpp:

(JSC::JSPromiseConstructorFuncCast):
(JSC::JSPromiseConstructorFuncResolve):
(JSC::JSPromiseConstructorFuncReject):
(JSC::JSPromiseConstructorFuncAll):

• runtime/JSPromiseDeferred.cpp:

(JSC::updateDeferredFromPotentialThenable):
(JSC::performDeferredResolve):
(JSC::performDeferredReject):
(JSC::abruptRejection):

• runtime/JSPromiseDeferred.h:
• runtime/JSPromiseFunctions.cpp:

(JSC::promiseAllCountdownFunction):
(JSC::createPromiseAllCountdownFunction):

• runtime/JSPromiseFunctions.h:
• runtime/JSPromiseReaction.cpp:

(JSC::ExecutePromiseReactionMicrotask::run):

LayoutTests:

Enabled and fix the existing Promise.all() test case.

• Promise.all() and Promise.all({}) should reject by my reading of the spec.

Also removes the Promise.all() shim used by the crypto tests.

• crypto/subtle/resources/common.js:
• js/dom/Promise-static-all-expected.txt:
• js/dom/Promise-static-all.html:

File:

• trunk/Source/JavaScriptCore/runtime/JSPromiseFunctions.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSPromiseFunctions.cpp

@@ -35 +35 @@
 #include "JSPromiseConstructor.h"
 #include "JSPromiseDeferred.h"
+#include "NumberObject.h"
 
 namespace JSC {
@@ -70 +71 @@
 {
     return JSFunction::create(vm, globalObject, 1, ASCIILiteral("IdentityFunction"), identifyFunction);
+}
+
+// Promise.All Countdown Functions
+
+static EncodedJSValue JSC_HOST_CALL promiseAllCountdownFunction(ExecState* exec)
+{
+    JSValue x = exec->argument(0);
+    VM& vm = exec->vm();
+    JSObject* F = exec->callee();
+
+    // 1. Let 'index' be the value of F's [[Index]] internal slot.
+    uint32_t index = F->get(exec, vm.propertyNames->indexPrivateName).asUInt32();
+
+    // 2. Let 'values' be the value of F's [[Values]] internal slot..
+    JSArray* values = jsCast<JSArray*>(F->get(exec, vm.propertyNames->valuesPrivateName));
+
+    // 3. Let 'deferred' be the value of F's [[Deferred]] internal slot.
+    JSPromiseDeferred* deferred = jsCast<JSPromiseDeferred*>(F->get(exec, vm.propertyNames->deferredPrivateName));
+
+    // 4. Let 'countdownHolder' be the value of F's [[CountdownHolder]] internal slot.
+    NumberObject* countdownHolder = jsCast<NumberObject*>(F->get(exec, vm.propertyNames->countdownHolderPrivateName));
+
+    // 5. Let 'result' be the result of calling the [[DefineOwnProperty]] internal method
+    //    of 'values' with arguments 'index' and Property Descriptor { [[Value]]: x,
+    //    [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: true }.
+    values->putDirectIndex(exec, index, x);
+
+    // 6. RejectIfAbrupt(result, deferred).
+    if (exec->hadException())
+        abruptRejection(exec, deferred);
+
+    // 7. Set countdownHolder.[[Countdown]] to countdownHolder.[[Countdown]] - 1.
+    uint32_t newCountdownValue = countdownHolder->internalValue().asUInt32() - 1;
+    countdownHolder->setInternalValue(vm, JSValue(newCountdownValue));
+
+    // 8. If countdownHolder.[[Countdown]] is 0,
+    if (!newCountdownValue) {
+        // i. Return the result of calling the [[Call]] internal method of deferred.[[Resolve]]
+        //    with undefined as thisArgument and a List containing 'values' as argumentsList.
+        performDeferredResolve(exec, deferred, values);
+    }
+
+    // 9. Return.
+    return JSValue::encode(jsUndefined());
+}
+
+JSFunction* createPromiseAllCountdownFunction(VM& vm, JSGlobalObject* globalObject)
+{
+    return JSFunction::create(vm, globalObject, 1, ASCIILiteral("PromiseAllCountdownFunction"), promiseAllCountdownFunction);
 }