Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1317376 - Part 2: Detect Promise self-resolution when resolving through the Promise resolving fast path. r=till

Browse Source 
--HG--
extra : rebase_source : 3748ed4c013de6e52fa767d29e56a32ddcdddd71
This commit is contained in:
André Bargull 2017-01-09 06:58:17 -08:00
parent bbbfe8d74c
commit 485f64c28c
2 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
js/src/builtin/Promise.cpp
View File

@ -336,16 +336,28 @@ static MOZ_MUST_USE bool EnqueuePromiseResolveThenableJob(JSContext* cx,
HandleValue thenable,
HandleValue thenVal);
// ES2016, 25.4.1.3.2, steps 7-13.
// ES2016, 25.4.1.3.2, steps 6-13.
static MOZ_MUST_USE bool
ResolvePromiseInternal(JSContext* cx, HandleObject promise, HandleValue resolutionVal)
{
// Step 7.
// Step 7 (reordered).
if (!resolutionVal.isObject())
return FulfillMaybeWrappedPromise(cx, promise, resolutionVal);
RootedObject resolution(cx, &resolutionVal.toObject());
// Step 6.
if (resolution == promise) {
// Step 6.a.
JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
JSMSG_CANNOT_RESOLVE_PROMISE_WITH_ITSELF);
RootedValue selfResolutionError(cx);
MOZ_ALWAYS_TRUE(GetAndClearException(cx, &selfResolutionError));
// Step 6.b.
return RejectMaybeWrappedPromise(cx, promise, selfResolutionError);
}
// Step 8.
RootedValue thenVal(cx);
bool status = GetProperty(cx, resolution, resolution, cx->names().then, &thenVal);
@ -411,22 +423,6 @@ ResolvePromiseFunction(JSContext* cx, unsigned argc, Value* vp)
// functions. Actually marking it as fulfilled/rejected happens later.
ClearResolutionFunctionSlots(resolve);
// Step 6.
if (resolutionVal == promiseVal) {
// Step 6.a.
JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
JSMSG_CANNOT_RESOLVE_PROMISE_WITH_ITSELF);
RootedValue selfResolutionError(cx);
bool status = GetAndClearException(cx, &selfResolutionError);
MOZ_ASSERT(status);
// Step 6.b.
status = RejectMaybeWrappedPromise(cx, promise, selfResolutionError);
if (status)
args.rval().setUndefined();
return status;
}
bool status = ResolvePromiseInternal(cx, promise, resolutionVal);
if (status)
args.rval().setUndefined();

22
js/src/tests/ecma_6/Promise/self-resolve.js
View File

@ -5,6 +5,7 @@ if (!this.Promise) {
quit(0);
}
// Resolve Promise with itself by directly calling the "Promise Resolve Function".
let resolve;
let promise = new Promise(function(x) { resolve = x; });
resolve(promise)
@ -20,4 +21,25 @@ drainJobQueue()
assertEq(results.length, 1);
assertEq(results[0], "rejected");
// Resolve Promise with itself when the "Promise Resolve Function" is called
// from (the fast path in) PromiseReactionJob.
results = [];
promise = new Promise(x => { resolve = x; });
let promise2 = promise.then(() => promise2);
promise2.then(() => assertEq(true, false, "not reached"), res => {
assertEq(res instanceof TypeError, true);
results.push("rejected");
});
resolve();
drainJobQueue();
assertEq(results.length, 1);
assertEq(results[0], "rejected");
this.reportCompare && reportCompare(0, 0, "ok");