Bug 1901411 - Part 3: Revert inlining of AsyncGeneratorDrainQueue in …

…AsyncGeneratorNext. r=mgaudet,jandem a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D213353
NanaseRuri · Jun 19, 2024 · 63811a2 · 63811a2
1 parent 25ff26b
commit 63811a2
Showing 1 changed file with 7 additions and 40 deletions.
diff --git a/js/src/vm/AsyncIteration.cpp b/js/src/vm/AsyncIteration.cpp
@@ -851,48 +851,15 @@ bool js::AsyncGeneratorNext(JSContext* cx, unsigned argc, Value* vp) {
     return false;
   }
 
-  // Step 5. Let state be generator.[[AsyncGeneratorState]].
-  // Step 6. If state is completed, then
-  if (generator->isCompleted()) {
-    // Step 6.a. Let iteratorResult be
-    //           ! CreateIterResultObject(undefined, true).
-    JSObject* resultObj =
-        CreateIterResultObject(cx, UndefinedHandleValue, true);
-    if (!resultObj) {
-      return false;
-    }
-
-    // Step 6.b. Perform
-    //           ! Call(promiseCapability.[[Resolve]], undefined,
-    //                  « iteratorResult »).
-    RootedValue resultValue(cx, ObjectValue(*resultObj));
-    if (!ResolvePromiseInternal(cx, resultPromise, resultValue)) {
-      return false;
-    }
-  } else {
-    // Step 7. Let completion be NormalCompletion(value).
-    // Step 8. Perform
-    //         ! AsyncGeneratorEnqueue(generator, completion,
-    //                                 promiseCapability).
-    if (!AsyncGeneratorEnqueue(cx, generator, CompletionKind::Normal,
-                               completionValue, resultPromise)) {
+  // Steps 5-10.
+  if (!AsyncGeneratorEnqueue(cx, generator, CompletionKind::Normal,
+                             completionValue, resultPromise)) {
+    return false;
+  }
+  if (!generator->isExecuting() && !generator->isAwaitingYieldReturn()) {
+    if (!AsyncGeneratorDrainQueue(cx, generator)) {
       return false;
     }
-
-    // Step 9. If state is either suspendedStart or suspendedYield, then
-    if (generator->isSuspendedStart() || generator->isSuspendedYield()) {
-      RootedValue resumptionValue(cx, completionValue);
-      // Step 9.a. Perform ! AsyncGeneratorResume(generator, completion).
-      if (!AsyncGeneratorResume(cx, generator, CompletionKind::Normal,
-                                resumptionValue)) {
-        return false;
-      }
-    } else {
-      // Step 10. Else,
-      // Step 10.a. Assert: state is either executing or awaiting-return.
-      MOZ_ASSERT(generator->isExecuting() || generator->isAwaitingReturn() ||
-                 generator->isAwaitingYieldReturn());
-    }
   }
 
   // Step 6.c. Return promiseCapability.[[Promise]].