Skip to content

Clear sidetable pointer on OSR tier up #710

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
titzer merged 3 commits into from
Oct 1, 2026
Merged

Clear sidetable pointer on OSR tier up #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1aec858
Clear the `stp` slot in the frame when performing OSR
matthew-mojira Sep 17, 2026
b3d4d7d
Merge branch 'master' into fix_osr_stale_tag
matthew-mojira Sep 24, 2026
ab5e8f6
Move comment
matthew-mojira Sep 24, 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
4 changes: 4 additions & 0 deletions src/engine/compiler/SinglePassCompiler.v3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2127,6 +2127,10 @@ class SinglePassCompiler(xenv: SpcExecEnv, masm: MacroAssembler, regAlloc: RegAl
if (Trace.compiler) Trace.OUT.put1(" OSR (+%d)", osr_entry_label.create_pos).ln();
masm.bindLabel(osr_entry_label);
emit_reload_regs();
if (SpcTuning.inlineWhammProbes && SpcTuning.intrinsifyWhammProbe) {
Comment thread
titzer marked this conversation as resolved.
// Clear sidetable pointer in this slot
masm.emit_mov_m_l(frame.inlined_instance_slot, 0);
}
for (i < u32.!(state.length)) {
var sv = state[i];
var iv = SpcVal(sv.kindFlags(IS_STORED | TAG_STORED), NO_REG, 0);
Expand Down
Binary file added test/wizeng/osr_gc.wasm
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions test/wizeng/osr_gc.wasm.exit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0
1 change: 1 addition & 0 deletions test/wizeng/osr_gc.wasm.flags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--expose=wizeng
7 changes: 7 additions & 0 deletions test/wizeng/osr_gc.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(module
(import "wizeng" "force_gc" (func $gc))
(func (export "main") (local $i i32)
;; the loop tiers up while this frame still holds the interpreter's sidetable pointer
(loop $l
(call $gc)
(br_if $l (i32.lt_u (local.tee $i (i32.add (local.get $i) (i32.const 1))) (i32.const 10))))))
Loading