warn

youknowone · youknowone · commit bc7e50ef5ad7 · 2026-01-02T12:06:57.000+09:00
diff --git a/crates/vm/src/warn.rs b/crates/vm/src/warn.rs
@@ -406,39 +406,18 @@ fn setup_context(
         (f.globals.clone(), f.code.source_path, f.f_lineno())
     } else if let Some(frame) = vm.current_frame() {
         // We have a frame but it wasn't found during stack walking
-        (frame.globals.clone(), vm.ctx.intern_str("sys"), 1)
+        (frame.globals.clone(), vm.ctx.intern_str("<sys>"), 1)
     } else {
-        // No frames on the stack - we're in interpreter shutdown or similar state
-        // Use __main__ globals if available, otherwise skip the warning
-        match vm
+        // No frames on the stack - use sys.__dict__ (interp->sysdict in CPython)
+        let globals = vm
             .sys_module
-            .get_attr(identifier!(vm, modules), vm)
-            .and_then(|modules| modules.get_item(vm.ctx.intern_str("__main__"), vm))
-            .and_then(|main_mod| main_mod.get_attr(identifier!(vm, __dict__), vm))
-        {
-            Ok(globals) => {
-                if let Ok(dict) = globals.downcast::<crate::builtins::PyDict>() {
-                    (dict, vm.ctx.intern_str("sys"), 1)
-                } else {
-                    // Cannot get globals, skip warning
-                    return Ok((
-                        vm.ctx.intern_str("sys").to_owned(),
-                        1,
-                        None,
-                        vm.ctx.new_dict().into(),
-                    ));
-                }
-            }
-            Err(_) => {
-                // Cannot get __main__ globals, skip warning
-                return Ok((
-                    vm.ctx.intern_str("sys").to_owned(),
-                    1,
-                    None,
-                    vm.ctx.new_dict().into(),
-                ));
-            }
-        }
+            .as_object()
+            .get_attr(identifier!(vm, __dict__), vm)
+            .and_then(|d| {
+                d.downcast::<crate::builtins::PyDict>()
+                    .map_err(|_| vm.new_type_error("sys.__dict__ is not a dictionary"))
+            })?;
+        (globals, vm.ctx.intern_str("<sys>"), 0)
     };
 
     let registry = if let Ok(registry) = globals.get_item(__warningregistry__, vm) {
