Skip to content

jit(bridge): read the traced frame's vable pointer when patching a retraced loop #889

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

Closed
fregataa wants to merge 1 commit into from
Closed

jit(bridge): read the traced frame's vable pointer when patching a retraced loop #889

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 11 additions & 9 deletions majit/majit-metainterp/src/pyjitpl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5229,15 +5229,17 @@ impl<M: Clone> MetaInterp<M> {
if let Some(ptr) = from_consts {
return ptr;
}
// Bridge traces start from rebuilt resume state, not a fresh portal
// entry, so `initial_inputarg_consts` is not seeded with the
// virtualizable inputarg's ConstPtr. The live virtualizable pointer
// cached by `set_vable_ptr` during JitState setup is the same heap
// object (`orig_inpargs[idx].getref_base()`), so fall back to it.
if !self.vable_ptr.is_null() {
return self.vable_ptr;
}
ctx.virtualizable_heap_ptr().unwrap_or(std::ptr::null())
// Bridge traces have no ConstPtr seeded in `initial_inputarg_consts`.
// Prefer the trace-local pointer (RPython's `orig_inpargs` is the
// trace's own history): `TraceCtx::virtualizable_heap_ptr` is restored
// by the residual-call epilogue after a re-entrant callee deopts,
// while `MetaInterp::vable_ptr` may still point at a nested frame
// whose shorter `locals_cells_stack_w` would break the virtualizable
// field-load preamble's inputargs accounting.
if let Some(ptr) = ctx.virtualizable_heap_ptr().filter(|p| !p.is_null()) {
return ptr;
}
self.vable_ptr
}

/// compile.py:168 / pyjitpl.py:3605 parity: every real loop token must
Expand Down
Loading