Skip to content

fix asyncgen finalizer #6761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 1 commit into from
Jan 18, 2026
Merged

fix asyncgen finalizer #6761

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions crates/vm/src/builtins/asyncgenerator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,14 @@ impl PyAsyncGen {
if let Some(finalizer) = finalizer
&& !zelf.inner.closed.load()
{
// Ignore any errors (PyErr_WriteUnraisable)
// Create a strong reference for the finalizer call.
// This keeps the object alive during the finalizer execution.
let obj: PyObjectRef = zelf.to_owned().into();
let _ = finalizer.call((obj,), vm);

// Call the finalizer. Any exceptions are handled as unraisable.
if let Err(e) = finalizer.call((obj,), vm) {
vm.run_unraisable(e, Some("async generator finalizer".to_owned()), finalizer);
}
}
}

Expand Down Expand Up @@ -496,11 +501,13 @@ impl PyAsyncGenAThrow {
}
fn yield_close(&self, vm: &VirtualMachine) -> PyBaseExceptionRef {
self.ag.running_async.store(false);
self.ag.inner.closed.store(true);
self.state.store(AwaitableState::Closed);
vm.new_runtime_error("async generator ignored GeneratorExit")
}
fn check_error(&self, exc: PyBaseExceptionRef, vm: &VirtualMachine) -> PyBaseExceptionRef {
self.ag.running_async.store(false);
self.ag.inner.closed.store(true);
self.state.store(AwaitableState::Closed);
if self.aclose
&& (exc.fast_isinstance(vm.ctx.exceptions.stop_async_iteration)
Expand Down Expand Up @@ -687,12 +694,14 @@ impl IterNext for PyAnextAwaitable {
/// _PyGen_Finalize for async generators
impl Destructor for PyAsyncGen {
fn del(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<()> {
// Generator isn't paused, so no need to close
// Generator is already closed, nothing to do
if zelf.inner.closed.load() {
return Ok(());
}

// Call the async generator finalizer hook if set.
Self::call_finalizer(zelf, vm);

Ok(())
}
}
Expand Down
Loading