apply code review

youknowone · youknowone · commit c56f9fce2290 · 2026-04-12T15:40:23.000+09:00
diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs
@@ -3309,7 +3309,6 @@ fn is_scope_exit_block(block: &Block) -> bool {
         .is_some_and(|instr| instr.instr.is_scope_exit())
 }
 
-#[allow(dead_code)]
 fn is_exception_cleanup_block(block: &Block) -> bool {
     block
         .instructions
@@ -3322,7 +3321,7 @@ fn is_exception_cleanup_block(block: &Block) -> bool {
 }
 
 fn block_is_exceptional(block: &Block) -> bool {
-    block.except_handler || block.preserve_lasti
+    block.except_handler || block.preserve_lasti || is_exception_cleanup_block(block)
 }
 
 fn trailing_conditional_jump_index(block: &Block) -> Option<usize> {
@@ -3773,9 +3772,6 @@ fn duplicate_jump_targets_without_lineno(blocks: &mut Vec<Block>, predecessors:
         last_mut.target = new_idx;
         predecessors[target.idx()] -= 1;
         predecessors.push(1);
-        if old_next != BlockIdx::NULL {
-            predecessors[old_next.idx()] += 1;
-        }
 
         current = old_next;
     }
diff --git a/crates/vm/src/stdlib/_thread.rs b/crates/vm/src/stdlib/_thread.rs
@@ -903,7 +903,7 @@ pub(crate) mod _thread {
     // Guard that removes thread-local data when dropped
     struct LocalGuard {
         local: Weak<LocalData>,
-        thread_id: std::thread::ThreadId,
+        thread_id: u64,
     }
 
     impl Drop for LocalGuard {
@@ -919,7 +919,7 @@ pub(crate) mod _thread {
 
     // Shared data structure for Local
     struct LocalData {
-        data: parking_lot::Mutex<std::collections::HashMap<std::thread::ThreadId, PyDictRef>>,
+        data: parking_lot::Mutex<std::collections::HashMap<u64, PyDictRef>>,
     }
 
     impl fmt::Debug for LocalData {
@@ -938,7 +938,7 @@ pub(crate) mod _thread {
     #[pyclass(with(GetAttr, SetAttr), flags(BASETYPE))]
     impl Local {
         fn l_dict(&self, vm: &VirtualMachine) -> PyDictRef {
-            let thread_id = std::thread::current().id();
+            let thread_id = current_thread_id();
 
             // Fast path: check if dict exists under lock
             if let Some(dict) = self.inner.data.lock().get(&thread_id).cloned() {
@@ -974,6 +974,11 @@ pub(crate) mod _thread {
             dict
         }
 
+        #[pygetset(name = "__dict__")]
+        fn dict(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyDictRef {
+            zelf.l_dict(vm)
+        }
+
         #[pyslot]
         fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
             Self {
diff --git a/extra_tests/snippets/stdlib_threading.py b/extra_tests/snippets/stdlib_threading.py
@@ -20,7 +20,7 @@ def run_exec(code):
 
     def worker():
         scope = {"__builtins__": __builtins__}
-        exec(code, scope, scope)
+        exec(code, scope, scope)  # noqa: S102 - intentional threaded exec regression test
         result["scope"] = scope
 
     thread = threading.Thread(target=worker)

Original file line number	Diff line number	Diff line change
`@@ -3309,7 +3309,6 @@ fn is_scope_exit_block(block: &Block) -> bool {`
`3309`	`3309`	`.is_some_and(\|instr\| instr.instr.is_scope_exit())`
`3310`	`3310`	`}`
`3311`	`3311`
`3312`		`-#[allow(dead_code)]`
`3313`	`3312`	`fn is_exception_cleanup_block(block: &Block) -> bool {`
`3314`	`3313`	`block`
`3315`	`3314`	`.instructions`
`@@ -3322,7 +3321,7 @@ fn is_exception_cleanup_block(block: &Block) -> bool {`
`3322`	`3321`	`}`
`3323`	`3322`
`3324`	`3323`	`fn block_is_exceptional(block: &Block) -> bool {`
`3325`		`- block.except_handler \|\| block.preserve_lasti`
	`3324`	`+ block.except_handler \|\| block.preserve_lasti \|\| is_exception_cleanup_block(block)`
`3326`	`3325`	`}`
`3327`	`3326`
`3328`	`3327`	`fn trailing_conditional_jump_index(block: &Block) -> Option<usize> {`
`@@ -3773,9 +3772,6 @@ fn duplicate_jump_targets_without_lineno(blocks: &mut Vec<Block>, predecessors:`
`3773`	`3772`	`last_mut.target = new_idx;`
`3774`	`3773`	`predecessors[target.idx()] -= 1;`
`3775`	`3774`	`predecessors.push(1);`
`3776`		`- if old_next != BlockIdx::NULL {`
`3777`		`- predecessors[old_next.idx()] += 1;`
`3778`		`- }`
`3779`	`3775`
`3780`	`3776`	`current = old_next;`
`3781`	`3777`	`}`