Skip to content

Clear frame locals and stack on generator close + Add dir_fd support for rmdir, remove/unlink, scandir #7222

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 3 commits into from
Feb 26, 2026
Merged

Clear frame locals and stack on generator close + Add dir_fd support for rmdir, remove/unlink, scandir #7222

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
055584c
Clear frame locals and stack on generator close
youknowone Feb 25, 2026
7e7832d
Add dir_fd support for rmdir, remove/unlink, scandir
youknowone Feb 24, 2026
a25d565
cells_free
youknowone Feb 26, 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
Next Next commit
Clear frame locals and stack on generator close 
Add Frame::clear_locals_and_stack() to release references held by
closed generators/coroutines, matching _PyFrame_ClearLocals behavior.
Call it from Coro::close() after marking the coroutine as closed.

Update test_generators.py expectedFailure markers accordingly.
  • Loading branch information
@youknowone
youknowone committed Feb 26, 2026
commit 055584c1145fb606a862ad540ed31dd85946772b
2 changes: 1 addition & 1 deletion Lib/test/test_generators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,6 @@ def f():
with self.assertRaises(RuntimeError):
gen.close()

@unittest.expectedFailure # TODO: RUSTPYTHON; no deterministic GC finalization
def test_close_releases_frame_locals(self):
# See gh-118272

Expand All @@ -684,6 +683,7 @@ def genfn():

# See https://github.com/python/cpython/issues/125723
class GeneratorDeallocTest(unittest.TestCase):
@unittest.expectedFailure # TODO: RUSTPYTHON; frame uses shared Arc, no ownership transfer
def test_frame_outlives_generator(self):
def g1():
a = 42
Expand Down
3 changes: 3 additions & 0 deletions crates/vm/src/coroutine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,9 @@ impl Coro {
)
});
self.closed.store(true);
// Release frame locals and stack to free references held by the
// closed generator, matching gen_send_ex2 with close_on_completion.
self.frame.clear_locals_and_stack();
match result {
Ok(ExecutionResult::Yield(_)) => {
Err(vm.new_runtime_error(format!("{} ignored GeneratorExit", gen_name(jen, vm))))
Expand Down
10 changes: 10 additions & 0 deletions crates/vm/src/frame.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,16 @@ impl Frame {
self.state.lock().stack.clear();
}

/// Clear locals and stack after generator/coroutine close.
/// Releases references held by the frame, matching _PyFrame_ClearLocals.
pub(crate) fn clear_locals_and_stack(&self) {
self.state.lock().stack.clear();
let mut fastlocals = self.fastlocals.lock();
for slot in fastlocals.iter_mut() {
*slot = None;
}
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

/// Store a borrowed back-reference to the owning generator/coroutine.
/// The caller must ensure the generator outlives the frame.
pub fn set_generator(&self, generator: &PyObject) {
Expand Down