no static for asyncgen

youknowone · youknowone · commit 334bb987cf32 · 2026-01-12T15:33:06.000+09:00
diff --git a/crates/vm/src/builtins/asyncgenerator.rs b/crates/vm/src/builtins/asyncgenerator.rs
@@ -57,14 +57,14 @@ impl PyAsyncGen {
 
         zelf.ag_hooks_inited.store(true);
 
-        // Get and store finalizer from thread-local storage
-        let finalizer = crate::vm::thread::ASYNC_GEN_FINALIZER.with_borrow(|f| f.as_ref().cloned());
+        // Get and store finalizer from VM
+        let finalizer = vm.async_gen_finalizer.borrow().clone();
         if let Some(finalizer) = finalizer {
             *zelf.ag_finalizer.lock() = Some(finalizer);
         }
 
         // Call firstiter hook
-        let firstiter = crate::vm::thread::ASYNC_GEN_FIRSTITER.with_borrow(|f| f.as_ref().cloned());
+        let firstiter = vm.async_gen_firstiter.borrow().clone();
         if let Some(firstiter) = firstiter {
             let obj: PyObjectRef = zelf.to_owned().into();
             firstiter.call((obj,), vm)?;
diff --git a/crates/vm/src/stdlib/sys.rs b/crates/vm/src/stdlib/sys.rs
@@ -1229,10 +1229,10 @@ mod sys {
         }
 
         if let Some(finalizer) = args.finalizer.into_option() {
-            crate::vm::thread::ASYNC_GEN_FINALIZER.set(finalizer);
+            *vm.async_gen_finalizer.borrow_mut() = finalizer;
         }
         if let Some(firstiter) = args.firstiter.into_option() {
-            crate::vm::thread::ASYNC_GEN_FIRSTITER.set(firstiter);
+            *vm.async_gen_firstiter.borrow_mut() = firstiter;
         }
 
         Ok(())
@@ -1254,12 +1254,8 @@ mod sys {
     #[pyfunction]
     fn get_asyncgen_hooks(vm: &VirtualMachine) -> AsyncgenHooksData {
         AsyncgenHooksData {
-            firstiter: crate::vm::thread::ASYNC_GEN_FIRSTITER
-                .with_borrow(Clone::clone)
-                .to_pyobject(vm),
-            finalizer: crate::vm::thread::ASYNC_GEN_FINALIZER
-                .with_borrow(Clone::clone)
-                .to_pyobject(vm),
+            firstiter: vm.async_gen_firstiter.borrow().clone().to_pyobject(vm),
+            finalizer: vm.async_gen_finalizer.borrow().clone().to_pyobject(vm),
         }
     }
 
diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs
@@ -82,6 +82,10 @@ pub struct VirtualMachine {
     pub state: PyRc<PyGlobalState>,
     pub initialized: bool,
     recursion_depth: Cell<usize>,
+    /// Async generator firstiter hook (per-thread, set via sys.set_asyncgen_hooks)
+    pub async_gen_firstiter: RefCell<Option<PyObjectRef>>,
+    /// Async generator finalizer hook (per-thread, set via sys.set_asyncgen_hooks)
+    pub async_gen_finalizer: RefCell<Option<PyObjectRef>>,
 }
 
 #[derive(Debug, Default)]
@@ -220,6 +224,8 @@ impl VirtualMachine {
             }),
             initialized: false,
             recursion_depth: Cell::new(0),
+            async_gen_firstiter: RefCell::new(None),
+            async_gen_finalizer: RefCell::new(None),
         };
 
         if vm.state.hash_secret.hash_str("")
diff --git a/crates/vm/src/vm/thread.rs b/crates/vm/src/vm/thread.rs
@@ -1,6 +1,6 @@
-use crate::{AsObject, PyObject, PyObjectRef, VirtualMachine};
 #[cfg(feature = "threading")]
 use crate::frame::FrameRef;
+use crate::{AsObject, PyObject, VirtualMachine};
 use core::{
     cell::{Cell, RefCell},
     ptr::NonNull,
@@ -18,8 +18,6 @@ thread_local! {
     pub(super) static VM_STACK: RefCell<Vec<NonNull<VirtualMachine>>> = Vec::with_capacity(1).into();
 
     pub(crate) static COROUTINE_ORIGIN_TRACKING_DEPTH: Cell<u32> = const { Cell::new(0) };
-    pub(crate) static ASYNC_GEN_FINALIZER: RefCell<Option<PyObjectRef>> = const { RefCell::new(None) };
-    pub(crate) static ASYNC_GEN_FIRSTITER: RefCell<Option<PyObjectRef>> = const { RefCell::new(None) };
 
     /// Current thread's frame slot for sys._current_frames()
     #[cfg(feature = "threading")]
@@ -56,7 +54,10 @@ fn init_frame_slot_if_needed(vm: &VirtualMachine) {
         if slot.borrow().is_none() {
             let thread_id = crate::stdlib::thread::get_ident();
             let new_slot = Arc::new(parking_lot::Mutex::new(None));
-            vm.state.thread_frames.lock().insert(thread_id, new_slot.clone());
+            vm.state
+                .thread_frames
+                .lock()
+                .insert(thread_id, new_slot.clone());
             *slot.borrow_mut() = Some(new_slot);
         }
     });
@@ -233,6 +234,8 @@ impl VirtualMachine {
             state: self.state.clone(),
             initialized: self.initialized,
             recursion_depth: Cell::new(0),
+            async_gen_firstiter: RefCell::new(None),
+            async_gen_finalizer: RefCell::new(None),
         };
         ThreadedVirtualMachine { vm }
     }

Original file line number	Diff line number	Diff line change
`@@ -1229,10 +1229,10 @@ mod sys {`
`1229`	`1229`	`}`
`1230`	`1230`
`1231`	`1231`	`if let Some(finalizer) = args.finalizer.into_option() {`
`1232`		`- crate::vm::thread::ASYNC_GEN_FINALIZER.set(finalizer);`
	`1232`	`+ *vm.async_gen_finalizer.borrow_mut() = finalizer;`
`1233`	`1233`	`}`
`1234`	`1234`	`if let Some(firstiter) = args.firstiter.into_option() {`
`1235`		`- crate::vm::thread::ASYNC_GEN_FIRSTITER.set(firstiter);`
	`1235`	`+ *vm.async_gen_firstiter.borrow_mut() = firstiter;`
`1236`	`1236`	`}`
`1237`	`1237`
`1238`	`1238`	`Ok(())`
`@@ -1254,12 +1254,8 @@ mod sys {`
`1254`	`1254`	`#[pyfunction]`
`1255`	`1255`	`fn get_asyncgen_hooks(vm: &VirtualMachine) -> AsyncgenHooksData {`
`1256`	`1256`	`AsyncgenHooksData {`
`1257`		`- firstiter: crate::vm::thread::ASYNC_GEN_FIRSTITER`
`1258`		`- .with_borrow(Clone::clone)`
`1259`		`- .to_pyobject(vm),`
`1260`		`- finalizer: crate::vm::thread::ASYNC_GEN_FINALIZER`
`1261`		`- .with_borrow(Clone::clone)`
`1262`		`- .to_pyobject(vm),`
	`1257`	`+ firstiter: vm.async_gen_firstiter.borrow().clone().to_pyobject(vm),`
	`1258`	`+ finalizer: vm.async_gen_finalizer.borrow().clone().to_pyobject(vm),`
`1263`	`1259`	`}`
`1264`	`1260`	`}`
`1265`	`1261`