finl

Author: youknowone

crates/codegen/src/compile.rs

@@ -2393,6 +2393,15 @@ impl Compiler {
 
             self.pop_fblock(FBlockType::HandlerCleanup);
 
+            // Create a block for normal path continuation (after handler body succeeds)
+            let handler_normal_exit = self.new_block();
+            emit!(
+                self,
+                Instruction::Jump {
+                    target: handler_normal_exit,
+                }
+            );
+
             // CPython compile.c:3568-3577 - cleanup_end block for named handler
             // IMPORTANT: In CPython, cleanup_end is within outer SETUP_CLEANUP scope (line 3506),
             // so when RERAISE is executed, it goes to the cleanup block which does POP_EXCEPT.
@@ -2417,6 +2426,9 @@ impl Compiler {
                 );
             }
 
+            // Switch to normal exit block - this is where handler body success continues
+            self.switch_to_block(handler_normal_exit);
+
             // Now pop ExceptionHandler - the normal path continues from here
             // CPython compile.c:3557-3558: POP_BLOCK (HandlerCleanup) then POP_BLOCK (SETUP_CLEANUP)
             // followed by POP_EXCEPT at line 3559

crates/vm/src/frame.rs

@@ -393,7 +393,12 @@ impl ExecutingFrame<'_> {
                             }
                         }
 
-                        vm.contextualize_exception(&exception);
+                        // Only contextualize exception for new raises, not re-raises
+                        // CPython only calls _PyErr_SetObject (which does chaining) on initial raise
+                        // RERAISE just propagates the exception without modifying __context__
+                        if !is_reraise {
+                            vm.contextualize_exception(&exception);
+                        }
 
                         // Use exception table for zero-cost exception handling (CPython 3.11+)
                         // But first check if there's a handler in block stack (hybrid approach)