fix asyncgen

youknowone · youknowone · commit c48157d8562e · 2026-01-18T01:59:22.000+09:00
diff --git a/crates/vm/src/builtins/asyncgenerator.rs b/crates/vm/src/builtins/asyncgenerator.rs
@@ -79,9 +79,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);
+            }
         }
     }
 
@@ -463,11 +468,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)
@@ -647,12 +654,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(())
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,14 @@ impl PyAsyncGen {`
`79`	`79`	`if let Some(finalizer) = finalizer`
`80`	`80`	`&& !zelf.inner.closed.load()`
`81`	`81`	`{`
`82`		`- // Ignore any errors (PyErr_WriteUnraisable)`
	`82`	`+ // Create a strong reference for the finalizer call.`
	`83`	`+ // This keeps the object alive during the finalizer execution.`
`83`	`84`	`let obj: PyObjectRef = zelf.to_owned().into();`
`84`		`- let _ = finalizer.call((obj,), vm);`
	`85`	`+`
	`86`	`+ // Call the finalizer. Any exceptions are handled as unraisable.`
	`87`	`+ if let Err(e) = finalizer.call((obj,), vm) {`
	`88`	`+ vm.run_unraisable(e, Some("async generator finalizer".to_owned()), finalizer);`
	`89`	`+ }`
`85`	`90`	`}`
`86`	`91`	`}`
`87`	`92`
`@@ -463,11 +468,13 @@ impl PyAsyncGenAThrow {`
`463`	`468`	`}`
`464`	`469`	`fn yield_close(&self, vm: &VirtualMachine) -> PyBaseExceptionRef {`
`465`	`470`	`self.ag.running_async.store(false);`
	`471`	`+ self.ag.inner.closed.store(true);`
`466`	`472`	`self.state.store(AwaitableState::Closed);`
`467`	`473`	`vm.new_runtime_error("async generator ignored GeneratorExit")`
`468`	`474`	`}`
`469`	`475`	`fn check_error(&self, exc: PyBaseExceptionRef, vm: &VirtualMachine) -> PyBaseExceptionRef {`
`470`	`476`	`self.ag.running_async.store(false);`
	`477`	`+ self.ag.inner.closed.store(true);`
`471`	`478`	`self.state.store(AwaitableState::Closed);`
`472`	`479`	`if self.aclose`
`473`	`480`	`&& (exc.fast_isinstance(vm.ctx.exceptions.stop_async_iteration)`
`@@ -647,12 +654,14 @@ impl IterNext for PyAnextAwaitable {`
`647`	`654`	`/// _PyGen_Finalize for async generators`
`648`	`655`	`impl Destructor for PyAsyncGen {`
`649`	`656`	`fn del(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<()> {`
`650`		`- // Generator isn't paused, so no need to close`
	`657`	`+ // Generator is already closed, nothing to do`
`651`	`658`	`if zelf.inner.closed.load() {`
`652`	`659`	`return Ok(());`
`653`	`660`	`}`
`654`	`661`
	`662`	`+ // Call the async generator finalizer hook if set.`
`655`	`663`	`Self::call_finalizer(zelf, vm);`
	`664`	`+`
`656`	`665`	`Ok(())`
`657`	`666`	`}`
`658`	`667`	`}`