Skip to content

Fix asyncio related compiler/library issues #6837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 9 commits into from
Jan 23, 2026
Merged

Fix asyncio related compiler/library issues #6837

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4750bfc
Fix socket bytes support
youknowone Jan 22, 2026
0bed84d
fix unwind_fblock
youknowone Jan 22, 2026
1e3aad2
fix posix.sendfile
youknowone Jan 22, 2026
98467a0
fix ssl_write
youknowone Jan 22, 2026
c67451a
Fix SSL ZeroReturn
youknowone Jan 22, 2026
c5a88d0
fix context
youknowone Jan 22, 2026
19c3674
fix generator
youknowone Jan 22, 2026
710d501
Enable unittest test_async_case again
youknowone Jan 22, 2026
95c4d9e
apply review
youknowone Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix unwind_fblock
  • Loading branch information
@youknowone
youknowone committed Jan 23, 2026
commit 0bed84d01a7231eeafbd37a3726ed6824bdfb68e
43 changes: 23 additions & 20 deletions crates/codegen/src/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1528,27 +1528,30 @@ impl Compiler {
// Otherwise, if an exception occurs during the finally body, the stack
// will be unwound to the wrong depth and the return value will be lost.
if preserve_tos {
// Get the handler info from the saved fblock (or current handler)
// and create a new handler with stack_depth + 1
let (handler, stack_depth, preserve_lasti) =
if let Some(handler) = saved_fblock.fb_handler {
(
Some(handler),
saved_fblock.fb_stack_depth + 1, // +1 for return value
saved_fblock.fb_preserve_lasti,
)
} else {
// No handler in saved_fblock, check current handler
if let Some(current_handler) = self.current_except_handler() {
(
Some(current_handler.handler_block),
current_handler.stack_depth + 1, // +1 for return value
current_handler.preserve_lasti,
)
} else {
(None, 1, false) // No handler, but still track the return value
// Find the outer handler, skipping ALL FinallyTry blocks.
// During return unwinding, FinallyTry handlers (finally_except_block)
// should NOT catch exceptions from the finally body - those exceptions
// should propagate to the outer TryExcept handler instead.
// FinallyTry's handler is only for the try body's exceptions.
let (handler, stack_depth, preserve_lasti) = {
let code = self.code_stack.last().unwrap();
let mut found = None;
for fblock in code.fblock.iter().rev() {
// Skip FinallyTry blocks - their handlers are for exception path
if matches!(fblock.fb_type, FBlockType::FinallyTry) {
continue;
}
if let Some(handler) = fblock.fb_handler {
found = Some((
Some(handler),
fblock.fb_stack_depth + 1, // +1 for return value
fblock.fb_preserve_lasti,
));
break;
}
};
}
found.unwrap_or((None, 1, false))
};

self.push_fblock_with_handler(
FBlockType::PopValue,
Expand Down