From 3305e7626ddbdb0e787fd17cb26eb9ae18e16afe Mon Sep 17 00:00:00 2001 From: Maxime Chevalier-Boisvert Date: Thu, 6 Feb 2025 16:04:29 -0500 Subject: Store pc on frame state --- zjit/src/ir.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zjit/src/ir.rs b/zjit/src/ir.rs index c961ec7412..3d9d52f8c3 100644 --- a/zjit/src/ir.rs +++ b/zjit/src/ir.rs @@ -301,12 +301,16 @@ pub fn iseq_to_ssa(iseq: *const rb_iseq_t) -> Function { if let Some(block_id) = insn_idx_to_block.get(&insn_idx) { block = *block_id; } + // Get the current pc and opcode let pc = unsafe { rb_iseq_pc_at_idx(iseq, insn_idx.into()) }; + state.pc = pc; + // try_into() call below is unfortunate. Maybe pick i32 instead of usize for opcodes. let opcode: u32 = unsafe { rb_iseq_opcode_at_pc(iseq, pc) } .try_into() .unwrap(); + // Move to the next instruction to compile insn_idx += insn_len(opcode as usize); -- cgit v1.2.3