Skip to content
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.

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

YJIT: Fix staying in invalidated code after proc calls #6711

Merged
merged 1 commit into from Nov 11, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions yjit/src/codegen.rs
Expand Up @@ -5555,11 +5555,8 @@ fn gen_send_general(

let sp = asm.lea(ctx.sp_opnd(0));

// Write interpreter SP into CFP.
// Needed in case the callee yields to the block.
jit_save_pc(jit, asm);
// Store incremented PC into current control frame in case callee raises.
gen_save_sp(jit, asm, ctx);
// Save the PC and SP because the callee can make Ruby calls
jit_prepare_routine_call(jit, ctx, asm);

let kw_splat = flags & VM_CALL_KW_SPLAT;
let stack_argument_pointer = asm.lea(Opnd::mem(64, sp, -(argc) * SIZEOF_VALUE_I32));
Expand Down