Commit 7fb93bfa authored by Jan de Mooij's avatar Jan de Mooij Committed by rvandermeulen@mozilla.com
Browse files

Bug 1966612 - Fix promise combinator function state. a=RyanVM 

Original Revision: https://phabricator.services.mozilla.com/D249782

Differential Revision: https://phabricator.services.mozilla.com/D249824
parent cec6822c

js/src/builtin/Promise.cpp

+33 −13
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ enum RejectFunctionSlots { 


enum PromiseCombinatorElementFunctionSlots {

  PromiseCombinatorElementFunctionSlot_Data = 0,

  PromiseCombinatorElementFunctionSlot_ElementIndex,

  PromiseCombinatorElementFunctionSlot_ElementIndexOrResolveFunc,

};



enum ReactionJobSlots {
@@ -3130,7 +3130,8 @@ static bool Promise_static_all(JSContext* cx, unsigned argc, Value* vp) { 


static JSFunction* NewPromiseCombinatorElementFunction(

    JSContext* cx, Native native,

    Handle<PromiseCombinatorDataHolder*> dataHolder, uint32_t index);

    Handle<PromiseCombinatorDataHolder*> dataHolder, uint32_t index,

    Handle<Value> maybeResolveFunc);



static bool PromiseAllResolveElementFunction(JSContext* cx, unsigned argc,

                                             Value* vp);
@@ -3231,7 +3232,8 @@ static bool PromiseAllResolveElementFunction(JSContext* cx, unsigned argc, 


      // Steps 4.j-q.

      JSFunction* resolveFunc = NewPromiseCombinatorElementFunction(

          cx, PromiseAllResolveElementFunction, dataHolder, index);

          cx, PromiseAllResolveElementFunction, dataHolder, index,

          UndefinedHandleValue);

      if (!resolveFunc) {

        return nullptr;

      }
@@ -3871,7 +3873,8 @@ template <typename T> 


static JSFunction* NewPromiseCombinatorElementFunction(

    JSContext* cx, Native native,

    Handle<PromiseCombinatorDataHolder*> dataHolder, uint32_t index) {

    Handle<PromiseCombinatorDataHolder*> dataHolder, uint32_t index,

    Handle<Value> maybeResolveFunc) {

  JSFunction* fn = NewNativeFunction(

      cx, native, 1, nullptr, gc::AllocKind::FUNCTION_EXTENDED, GenericObject);

  if (!fn) {
@@ -3880,8 +3883,15 @@ static JSFunction* NewPromiseCombinatorElementFunction( 


  fn->setExtendedSlot(PromiseCombinatorElementFunctionSlot_Data,

                      ObjectValue(*dataHolder));

  fn->setExtendedSlot(PromiseCombinatorElementFunctionSlot_ElementIndex,

  if (maybeResolveFunc.isObject()) {

    fn->setExtendedSlot(

        PromiseCombinatorElementFunctionSlot_ElementIndexOrResolveFunc,

        maybeResolveFunc);

  } else {

    fn->setExtendedSlot(

        PromiseCombinatorElementFunctionSlot_ElementIndexOrResolveFunc,

        Int32Value(index));

  }

  return fn;

}
@@ -3914,6 +3924,14 @@ static bool PromiseCombinatorElementFunctionAlreadyCalled( 
  // Step 1. Let F be the active function object.

  JSFunction* fn = &args.callee().as<JSFunction>();



  constexpr size_t indexOrResolveFuncSlot =

      PromiseCombinatorElementFunctionSlot_ElementIndexOrResolveFunc;

  if (fn->getExtendedSlot(indexOrResolveFuncSlot).isObject()) {

    Value slotVal = fn->getExtendedSlot(indexOrResolveFuncSlot);

    fn = &slotVal.toObject().as<JSFunction>();

  }

  MOZ_RELEASE_ASSERT(fn->getExtendedSlot(indexOrResolveFuncSlot).isInt32());



  // Promise.all functions

  // Step 2. If F.[[AlreadyCalled]] is true, return undefined.

  // Promise.allSettled functions
@@ -3942,9 +3960,7 @@ static bool PromiseCombinatorElementFunctionAlreadyCalled( 
  // Step 4. Let index be F.[[Index]].

  // Promise.allSettled functions

  // Step 5. Let index be F.[[Index]].

  int32_t idx =

      fn->getExtendedSlot(PromiseCombinatorElementFunctionSlot_ElementIndex)

          .toInt32();

  int32_t idx = fn->getExtendedSlot(indexOrResolveFuncSlot).toInt32();

  MOZ_ASSERT(idx >= 0);

  *index = uint32_t(idx);
@@ -3998,7 +4014,8 @@ static bool PromiseCombinatorElementFunctionAlreadyCalled( 


    // Steps 4.j-q.

    JSFunction* resolveFunc = NewPromiseCombinatorElementFunction(

        cx, PromiseAllResolveElementFunction, dataHolder, index);

        cx, PromiseAllResolveElementFunction, dataHolder, index,

        UndefinedHandleValue);

    if (!resolveFunc) {

      return false;

    }
@@ -4222,7 +4239,8 @@ static bool Promise_static_allSettled(JSContext* cx, unsigned argc, Value* vp) { 


    // Steps 4.j-r.

    JSFunction* resolveFunc = NewPromiseCombinatorElementFunction(

        cx, PromiseAllSettledResolveElementFunction, dataHolder, index);

        cx, PromiseAllSettledResolveElementFunction, dataHolder, index,

        UndefinedHandleValue);

    if (!resolveFunc) {

      return false;

    }
@@ -4230,7 +4248,8 @@ static bool Promise_static_allSettled(JSContext* cx, unsigned argc, Value* vp) { 


    // Steps 4.s-z.

    JSFunction* rejectFunc = NewPromiseCombinatorElementFunction(

        cx, PromiseAllSettledRejectElementFunction, dataHolder, index);

        cx, PromiseAllSettledRejectElementFunction, dataHolder, index,

        resolveFunVal);

    if (!rejectFunc) {

      return false;

    }
@@ -4459,7 +4478,8 @@ static void ThrowAggregateError(JSContext* cx, 


    // Steps 4.j-q.

    JSFunction* rejectFunc = NewPromiseCombinatorElementFunction(

        cx, PromiseAnyRejectElementFunction, dataHolder, index);

        cx, PromiseAnyRejectElementFunction, dataHolder, index,

        UndefinedHandleValue);

    if (!rejectFunc) {

      return false;

    }