fix: async-gen 被拒 yield 排队 next 得 done(unwrap 前 AwaitSuspended)

This commit is contained in:
爱特每羊队
2026-08-10 11:30:30 +08:00
parent d18b2adf08
commit 0b12e4df18
2 changed files with 62 additions and 4 deletions
+19 -4
View File
@@ -448,7 +448,8 @@ impl Vm {
let state = unsafe { &mut *state_ptr };
state.current.take()
};
unsafe { (*state_ptr).phase = AsyncGenPhase::YieldSuspended };
// 委托让出同样在 unwrap 前不可恢复(AsyncGeneratorYield 先 Await)。
unsafe { (*state_ptr).phase = AsyncGenPhase::AwaitSuspended };
self.snapshot_async_generator(state_ptr)?;
self.restore_inline_state(saved);
if let Some(req) = request {
@@ -529,7 +530,10 @@ impl Vm {
let state = unsafe { &mut *state_ptr };
state.current.take()
};
unsafe { (*state_ptr).phase = AsyncGenPhase::YieldSuspended };
// yield 值 unwrap 前视为 await 挂起(不可由新 next 恢复):AsyncGeneratorYield
// 先 Await(value),unwrap 完成前排队请求不得恢复生成器——否则被拒 yield 值
// 尚未结算,排队 next 会错误地继续执行。
unsafe { (*state_ptr).phase = AsyncGenPhase::AwaitSuspended };
self.snapshot_async_generator(state_ptr)?;
self.restore_inline_state(saved);
if let Some(req) = request {
@@ -779,14 +783,25 @@ fn async_gen_yield_unwrap_closure(vm: &mut Vm, args: &[u8]) -> NativeResult {
let obj = unsafe { &*ctx.as_js_object_ptr() };
if obj.is_async_generator_obj() {
let state = vm.async_gen_state_ptr(ctx);
// 仅在仍挂起在 yield 点(未被新的 next 恢复)时关闭。
if unsafe { (*state).phase } == AsyncGenPhase::YieldSuspended {
// 仅在仍挂起在 yield 点(unwrap 前 AwaitSuspended,未被新 next 恢复)时关闭。
if unsafe { (*state).phase } == AsyncGenPhase::AwaitSuspended {
unsafe { (*state).phase = AsyncGenPhase::Completed };
unsafe { (*state).result = JsValue::undefined() };
}
}
}
} else {
// yield 值 unwrap 完成:恢复可让出状态(async_generator_start 在 AwaitSuspended
// 下不启动,须先转回 YieldSuspended 才能恢复执行继续 yield/完成)。
if ctx.is_object() {
let obj = unsafe { &*ctx.as_js_object_ptr() };
if obj.is_async_generator_obj() {
let state = vm.async_gen_state_ptr(ctx);
if unsafe { (*state).phase } == AsyncGenPhase::AwaitSuspended {
unsafe { (*state).phase = AsyncGenPhase::YieldSuspended };
}
}
}
let result = if raw { value } else { make_iter_result(vm, value, false) };
let _ = vm.resolve_promise(promise, result);
}