roytam1/basilisk55
1
0
Fork 0
mirror of https://github.com/roytam1/basilisk55.git synced 2026-05-26 15:02:46 +00:00
Code Issues Projects Releases Wiki Activity

import from UXP: Issue #1725 - Fix logic in PerformPromiseAllSettled. (495db8d7)

Browse Source
This commit is contained in:
roytam1
2022-04-28 15:56:12 +08:00
parent 35b8ea6f28
commit 76bc0adea8
1 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/src/builtin/Promise.cpp
+29 -26
View File
@@ -1965,40 +1965,43 @@ PerformPromiseAllSettled(JSContext *cx, JS::ForOfIterator& iterator, HandleObjec
RootedValue nextPromise(cx);
RootedValue staticResolve(cx);
if (!GetProperty(cx, CVal, cx->names().resolve, &staticResolve))
return false;
RootedValue staticReject(cx);
if (!GetProperty(cx, CVal, cx->names().reject, &staticReject))
RootedValue staticReject(cx);
// Because Promise.allSettled can continue whether the promise is fulfilled or rejected, we
// should only return false if neither condition is true.
if (!GetProperty(cx, CVal, cx->names().resolve, &staticResolve) &&
!GetProperty(cx, CVal, cx->names().reject, &staticReject))
return false;
FixedInvokeArgs<1> resolveArgs(cx);
resolveArgs[0].set(nextValue);
if (!Call(cx, staticResolve, CVal, resolveArgs, &nextPromise))
return false;
FixedInvokeArgs<1> rejectArgs(cx);
rejectArgs[0].set(nextValue);
if (!Call(cx, staticReject, CVal, rejectArgs, &nextPromise))
if (!Call(cx, staticResolve, CVal, resolveArgs, &nextPromise) &&
!Call(cx, staticReject, CVal, rejectArgs, &nextPromise))
return false;
RootedFunction resolveFunc(cx, NewNativeFunction(cx, PromiseAllSettledResolveElementFunction,
1, nullptr,
gc::AllocKind::FUNCTION_EXTENDED,
GenericObject));
if (!resolveFunc)
return false;
RootedFunction rejectFunc(cx, NewNativeFunction(cx, PromiseAllSettledRejectElementFunction,
1, nullptr,
gc::AllocKind::FUNCTION_EXTENDED,
GenericObject));
if (!rejectFunc)
return false;
resolveFunc->setExtendedSlot(PromiseAllResolveElementFunctionSlot_Data, dataHolderVal);
resolveFunc->setExtendedSlot(PromiseAllResolveElementFunctionSlot_ElementIndex,
Int32Value(index));
rejectFunc->setExtendedSlot(PromiseAllResolveElementFunctionSlot_Data, dataHolderVal);
rejectFunc->setExtendedSlot(PromiseAllResolveElementFunctionSlot_ElementIndex,
Int32Value(index));
RootedFunction resolveFunc(cx, NewNativeFunction(cx, PromiseAllSettledResolveElementFunction,
1, nullptr,
gc::AllocKind::FUNCTION_EXTENDED,
GenericObject));
RootedFunction rejectFunc(cx, NewNativeFunction(cx, PromiseAllSettledRejectElementFunction,
1, nullptr,
gc::AllocKind::FUNCTION_EXTENDED,
GenericObject));
if (!resolveFunc && !rejectFunc) {
return false;
}
resolveFunc->setExtendedSlot(PromiseAllResolveElementFunctionSlot_Data, dataHolderVal);
resolveFunc->setExtendedSlot(PromiseAllResolveElementFunctionSlot_ElementIndex,
Int32Value(index));
rejectFunc->setExtendedSlot(PromiseAllResolveElementFunctionSlot_Data, dataHolderVal);
rejectFunc->setExtendedSlot(PromiseAllResolveElementFunctionSlot_ElementIndex,
Int32Value(index));
dataHolder->increaseRemainingCount();