Skip to content

Rework compiler about exception handling #6638

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 5 commits into from
Jan 4, 2026
Merged

Rework compiler about exception handling #6638

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f07a81
asyncgen
youknowone Jan 2, 2026
30e29ef
fix coroutine
youknowone Jan 3, 2026
03e2c59
rewrite compiler
youknowone Jan 3, 2026
183c4ea
tests
youknowone Jan 3, 2026
9bf4fd4
set pyc magic number
youknowone Jan 3, 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 coroutine
  • Loading branch information
@youknowone
youknowone committed Jan 3, 2026
commit 30e29efc84ab00105ca72e3694248a870807ff6e
29 changes: 26 additions & 3 deletions crates/vm/src/coroutine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,29 @@ impl Coro {
return Err(vm.new_value_error(format!("{} already executing", gen_name(jen, vm))));
}

vm.push_exception(self.exception.lock().take());
// swap exception state
// Get generator's saved exception state from last yield
let gen_exc = self.exception.lock().take();

let result = vm.with_frame(self.frame.clone(), func);
// Use a slot to capture generator's exception state before with_frame pops
let exception_slot = &self.exception;

*self.exception.lock() = vm.pop_exception();
// Run the generator frame
// with_frame does push_exception(None) which creates a new exception context
// The caller's exception remains in the chain via prev, so topmost_exception()
// will find it if generator's exception is None
let result = vm.with_frame(self.frame.clone(), |f| {
// with_frame pushed None, creating: { exc: None, prev: caller's exc_info }
// Pop None and push generator's exception instead
// This maintains the chain: { exc: gen_exc, prev: caller's exc_info }
vm.pop_exception();
vm.push_exception(gen_exc);
let result = func(f);
// Save generator's exception state BEFORE with_frame pops
// This is the generator's current exception context
*exception_slot.lock() = vm.current_exception();
result
});

self.running.store(false);
result
Expand Down Expand Up @@ -153,6 +171,11 @@ impl Coro {
if self.closed.load() {
return Ok(());
}
// If generator hasn't started (FRAME_CREATED), just mark as closed
if self.frame.lasti() == 0 {
self.closed.store(true);
return Ok(());
}
let result = self.run_with_context(jen, vm, |f| {
f.gen_throw(
vm,
Expand Down