fix asyncgen

youknowone · youknowone · commit c83681b7a818 · 2026-01-18T11:16:58.000+09:00
diff --git a/crates/vm/src/builtins/asyncgenerator.rs b/crates/vm/src/builtins/asyncgenerator.rs
@@ -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);
+            }
         }
     }
 
@@ -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)
@@ -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(())
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,14 @@ impl PyAsyncGen {`
`87`	`87`	`if let Some(finalizer) = finalizer`
`88`	`88`	`&& !zelf.inner.closed.load()`
`89`	`89`	`{`
`90`		`- // Ignore any errors (PyErr_WriteUnraisable)`
	`90`	`+ // Create a strong reference for the finalizer call.`
	`91`	`+ // This keeps the object alive during the finalizer execution.`
`91`	`92`	`let obj: PyObjectRef = zelf.to_owned().into();`
`92`		`- let _ = finalizer.call((obj,), vm);`
	`93`	`+`
	`94`	`+ // Call the finalizer. Any exceptions are handled as unraisable.`
	`95`	`+ if let Err(e) = finalizer.call((obj,), vm) {`
	`96`	`+ vm.run_unraisable(e, Some("async generator finalizer".to_owned()), finalizer);`
	`97`	`+ }`
`93`	`98`	`}`
`94`	`99`	`}`
`95`	`100`
`@@ -496,11 +501,13 @@ impl PyAsyncGenAThrow {`
`496`	`501`	`}`
`497`	`502`	`fn yield_close(&self, vm: &VirtualMachine) -> PyBaseExceptionRef {`
`498`	`503`	`self.ag.running_async.store(false);`
	`504`	`+ self.ag.inner.closed.store(true);`
`499`	`505`	`self.state.store(AwaitableState::Closed);`
`500`	`506`	`vm.new_runtime_error("async generator ignored GeneratorExit")`
`501`	`507`	`}`
`502`	`508`	`fn check_error(&self, exc: PyBaseExceptionRef, vm: &VirtualMachine) -> PyBaseExceptionRef {`
`503`	`509`	`self.ag.running_async.store(false);`
	`510`	`+ self.ag.inner.closed.store(true);`
`504`	`511`	`self.state.store(AwaitableState::Closed);`
`505`	`512`	`if self.aclose`
`506`	`513`	`&& (exc.fast_isinstance(vm.ctx.exceptions.stop_async_iteration)`
`@@ -687,12 +694,14 @@ impl IterNext for PyAnextAwaitable {`
`687`	`694`	`/// _PyGen_Finalize for async generators`
`688`	`695`	`impl Destructor for PyAsyncGen {`
`689`	`696`	`fn del(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<()> {`
`690`		`- // Generator isn't paused, so no need to close`
	`697`	`+ // Generator is already closed, nothing to do`
`691`	`698`	`if zelf.inner.closed.load() {`
`692`	`699`	`return Ok(());`
`693`	`700`	`}`
`694`	`701`
	`702`	`+ // Call the async generator finalizer hook if set.`
`695`	`703`	`Self::call_finalizer(zelf, vm);`
	`704`	`+`
`696`	`705`	`Ok(())`
`697`	`706`	`}`
`698`	`707`	`}`