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

ZJIT: Fix insn arg index for defined, add tests

Browse Source
This commit is contained in:
Alan Wu 2025-06-06 00:45:41 +09:00
parent 657b2f064b
commit 677c36370f
Notes: git 2025-06-06 13:30:31 +00:00 
Merged: https://github.com/ruby/ruby/pull/13528
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zjit/bindgen/src/main.rs
View File

@ -368,6 +368,7 @@ fn main() {
.allowlist_function("rb_iseqw_to_iseq")
.allowlist_function("rb_iseq_label")
.allowlist_function("rb_iseq_line_no")
.allowlist_function("rb_iseq_defined_string")
.allowlist_type("defined_type")
// From builtin.h

1
zjit/src/cruby_bindings.inc.rs generated
View File

@ -912,6 +912,7 @@ unsafe extern "C" {
pub fn rb_iseq_line_no(iseq: *const rb_iseq_t, pos: usize) -> ::std::os::raw::c_uint;
pub fn rb_iseqw_to_iseq(iseqw: VALUE) -> *const rb_iseq_t;
pub fn rb_iseq_label(iseq: *const rb_iseq_t) -> VALUE;
pub fn rb_iseq_defined_string(type_: defined_type) -> VALUE;
pub fn rb_profile_frames(
start: ::std::os::raw::c_int,
limit: ::std::os::raw::c_int,

21
zjit/src/hir.rs
View File

@ -606,6 +606,22 @@ impl<'a> std::fmt::Display for InsnPrinter<'a> {
Ok(())
},
Insn::Snapshot { state } => write!(f, "Snapshot {}", state),
Insn::Defined { op_type, v, .. } => {
// op_type (enum defined_type) printing logic from iseq.c.
// Not sure why rb_iseq_defined_string() isn't exhaustive.
use std::borrow::Cow;
let op_type = *op_type as u32;
let op_type = if op_type == DEFINED_FUNC {
Cow::Borrowed("func")
} else if op_type == DEFINED_REF {
Cow::Borrowed("ref")
} else if op_type == DEFINED_CONST_FROM {
Cow::Borrowed("constant-from")
} else {
String::from_utf8_lossy(unsafe { rb_iseq_defined_string(op_type).as_rstring_byte_slice().unwrap() })
};
write!(f, "Defined {op_type}, {v}")
}
Insn::DefinedIvar { self_val, id, .. } => write!(f, "DefinedIvar {self_val}, :{}", id.contents_lossy().into_owned()),
Insn::GetIvar { self_val, id, .. } => write!(f, "GetIvar {self_val}, :{}", id.contents_lossy().into_owned()),
Insn::SetIvar { self_val, id, val, .. } => write!(f, "SetIvar {self_val}, :{}, {val}", id.contents_lossy().into_owned()),
@ -2165,9 +2181,10 @@ pub fn iseq_to_hir(iseq: *const rb_iseq_t) -> Result<Function, ParseError> {
state.stack_push(fun.push_insn(block, Insn::Const { val: Const::Value(VALUE::fixnum_from_usize(1)) }));
}
YARVINSN_defined => {
// (rb_num_t op_type, VALUE obj, VALUE pushval)
let op_type = get_arg(pc, 0).as_usize();
let obj = get_arg(pc, 0);
let pushval = get_arg(pc, 0);
let obj = get_arg(pc, 1);
let pushval = get_arg(pc, 2);
let v = state.stack_pop()?;
state.stack_push(fun.push_insn(block, Insn::Defined { op_type, obj, pushval, v }));
}