1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Assert running_iseq before using it

Browse Source 
When running_iseq happens to be 0, it's better to fail on the assertion
rather than referencing the null pointer.
This commit is contained in:
Takashi Kokubun 2024-02-23 20:18:41 -08:00
parent 804b2a3787
commit e9e752c7ef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yjit/src/core.rs
View File

@ -2749,14 +2749,14 @@ fn branch_stub_hit_body(branch_ptr: *const c_void, target_idx: u32, ec: EcPtr) -
let original_interp_sp = get_cfp_sp(cfp);
let running_iseq = get_cfp_iseq(cfp);
assert_eq!(running_iseq, target_blockid.iseq as _, "each stub expects a particular iseq");
let reconned_pc = rb_iseq_pc_at_idx(running_iseq, target_blockid.idx.into());
let reconned_sp = original_interp_sp.offset(target_ctx.sp_offset.into());
// Unlike in the interpreter, our `leave` doesn't write to the caller's
// SP -- we do it in the returned-to code. Account for this difference.
let reconned_sp = reconned_sp.add(target_ctx.is_return_landing().into());
assert_eq!(running_iseq, target_blockid.iseq as _, "each stub expects a particular iseq");
// Update the PC in the current CFP, because it may be out of sync in JITted code
rb_set_cfp_pc(cfp, reconned_pc);