archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ZJIT: Reject builtin annotation if its iseq has multiple invokebuiltin insns

Browse source
This commit is contained in:
Stan Lo 2025-08-01 22:49:52 +01:00 • committed by Takashi Kokubun
parent 44dee185aa
commit 30a20bc166
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
zjit/src/cruby_methods.rs
View file

@ -99,6 +99,8 @@ fn annotate_builtin_method(props_map: &mut HashMap<*mut c_void, FnProperties>, c
// Scan through the ISEQ to find invokebuiltin instructions // Scan through the ISEQ to find invokebuiltin instructions
let mut insn_idx: u32 = 0; let mut insn_idx: u32 = 0;
let mut func_ptr = std::ptr::null_mut::<c_void>();
while insn_idx < encoded_size { while insn_idx < encoded_size {
// Get the PC for this instruction index // Get the PC for this instruction index
let pc = rb_iseq_pc_at_idx(iseq, insn_idx); let pc = rb_iseq_pc_at_idx(iseq, insn_idx);
@ -112,13 +114,22 @@ fn annotate_builtin_method(props_map: &mut HashMap<*mut c_void, FnProperties>, c
// The first operand is the builtin function pointer // The first operand is the builtin function pointer
let bf_value = *pc.add(1); let bf_value = *pc.add(1);
let bf_ptr = bf_value.as_ptr() as *const rb_builtin_function; let bf_ptr = bf_value.as_ptr() as *const rb_builtin_function;
let func_ptr = (*bf_ptr).func_ptr as *mut c_void;
props_map.insert(func_ptr, props); if func_ptr.is_null() {
func_ptr = (*bf_ptr).func_ptr as *mut c_void;
} else {
panic!("Multiple invokebuiltin instructions found in ISEQ for {}#{}",
std::ffi::CStr::from_ptr(rb_class2name(class)).to_str().unwrap_or("?"),
method_name);
}
} }
// Move to the next instruction using the proper length // Move to the next instruction using the proper length
insn_idx = insn_idx.saturating_add(rb_insn_len(VALUE(opcode as usize)).try_into().unwrap()); insn_idx = insn_idx.saturating_add(rb_insn_len(VALUE(opcode as usize)).try_into().unwrap());
} }
// Only insert the properties if its iseq has exactly one invokebuiltin instruction
props_map.insert(func_ptr, props);
} }
} }