Skip to content

Remove Frame mutex and use DataStack bump allocator for LocalsPlus #7333

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 14 commits into from
Mar 4, 2026
Merged

Remove Frame mutex and use DataStack bump allocator for LocalsPlus #7333

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f869c35
Remove PyMutex<FrameState> from Frame, use UnsafeCell fields directly
youknowone Mar 3, 2026
85df41e
Add thread-local DataStack for bump-allocating frame data
youknowone Mar 3, 2026
e286597
Unify FastLocals and BoxVec stack into LocalsPlus
youknowone Mar 3, 2026
9dbe95d
Use DataStack for LocalsPlus in non-generator function calls
youknowone Mar 3, 2026
a5981f0
Fix clippy: import Layout from core::alloc instead of alloc::alloc
youknowone Mar 3, 2026
938fdf7
Fix vectorcall compatibility with LocalsPlus API
youknowone Mar 3, 2026
fa49f5d
Add datastack, nlocalsplus, ncells, tstate to cspell dictionary
youknowone Mar 3, 2026
6a6e90d
Fix DataStack pop() for non-monotonic allocation addresses
youknowone Mar 4, 2026
2cc6b58
Fix stale comments: release_datastack -> materialize_localsplus
youknowone Mar 4, 2026
f300ff3
Fix non-threading mode for parallel test execution
youknowone Mar 4, 2026
927269c
Fix CallAllocAndEnterInit to use LocalsPlus stack API
youknowone Mar 4, 2026
e8d94bb
Use checked arithmetic in LocalsPlus and DataStack allocators
youknowone Mar 4, 2026
16778fc
Address code review: checked arithmetic, threading feature deps, Send…
youknowone Mar 4, 2026
22df0c6
Clean up comments: remove redundant/stale remarks, fix CPython refere…
youknowone Mar 4, 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 CallAllocAndEnterInit to use LocalsPlus stack API
  • Loading branch information
@youknowone
youknowone committed Mar 4, 2026
commit 927269c0c15bb48eca32cf4d213803ba801f94b6
5 changes: 2 additions & 3 deletions crates/vm/src/frame.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4311,9 +4311,8 @@ impl ExecutingFrame<'_> {
let cached_version = self.code.instructions.read_cache_u32(cache_base + 1);
let nargs: u32 = arg.into();
let callable = self.nth_value(nargs + 1);
let stack = &self.state.stack;
let stack_len = stack.len();
let self_or_null_is_some = stack[stack_len - nargs as usize - 1].is_some();
let stack_len = self.localsplus.stack_len();
let self_or_null_is_some = self.localsplus.stack_index(stack_len - nargs as usize - 1).is_some();
if !self_or_null_is_some
&& cached_version != 0
&& let Some(cls) = callable.downcast_ref::<PyType>()
Expand Down