extend types only for genesis

youknowone · youknowone · commit f77c40a2e8a4 · 2026-03-02T20:21:21.000+09:00
diff --git a/crates/vm/src/vm/context.rs b/crates/vm/src/vm/context.rs
@@ -285,7 +285,12 @@ impl Context {
         rustpython_common::static_cell! {
             static CONTEXT: PyRc<Context>;
         }
-        CONTEXT.get_or_init(|| PyRc::new(Self::init_genesis()))
+        CONTEXT.get_or_init(|| {
+            let ctx = PyRc::new(Self::init_genesis());
+            crate::types::TypeZoo::extend(&ctx);
+            crate::exceptions::ExceptionZoo::extend(&ctx);
+            ctx
+        })
     }
 
     fn init_genesis() -> Self {
diff --git a/crates/vm/src/vm/interpreter.rs b/crates/vm/src/vm/interpreter.rs
@@ -52,9 +52,6 @@ where
     let paths = getpath::init_path_config(&settings);
     let config = PyConfig::new(settings, paths);
 
-    crate::types::TypeZoo::extend(&ctx);
-    crate::exceptions::ExceptionZoo::extend(&ctx);
-
     // Build module_defs map from builtin modules + additional modules
     let mut all_module_defs: BTreeMap<&'static str, &'static builtins::PyModuleDef> =
         crate::stdlib::builtin_module_defs(&ctx)

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,12 @@ impl Context {`
`285`	`285`	`rustpython_common::static_cell! {`
`286`	`286`	`static CONTEXT: PyRc<Context>;`
`287`	`287`	`}`
`288`		`- CONTEXT.get_or_init(\|\| PyRc::new(Self::init_genesis()))`
	`288`	`+ CONTEXT.get_or_init(\|\| {`
	`289`	`+ let ctx = PyRc::new(Self::init_genesis());`
	`290`	`+ crate::types::TypeZoo::extend(&ctx);`
	`291`	`+ crate::exceptions::ExceptionZoo::extend(&ctx);`
	`292`	`+ ctx`
	`293`	`+ })`
`289`	`294`	`}`
`290`	`295`
`291`	`296`	`fn init_genesis() -> Self {`