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

Remove any object specialization in CCall optimization

Browse Source 
We don't want to only guard on the class
This commit is contained in:
Max Bernstein 2025-04-07 14:15:00 -04:00 committed by Takashi Kokubun
parent 5f69e35be2
commit 392c492b07
Notes: git 2025-04-18 13:47:40 +00:00 
Merged: https://github.com/ruby/ruby/pull/13131
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zjit/src/hir.rs
View File

@ -1036,7 +1036,7 @@ impl Function {
// Commit to the replacement. Put PatchPoint.
fun.push_insn(block, Insn::PatchPoint(Invariant::MethodRedefined { klass: recv_class, method: method_id }));
// Guard receiver class
fun.push_insn(block, Insn::GuardType { val: self_val, guard_type: *recv_type, state });
fun.push_insn(block, Insn::GuardType { val: self_val, guard_type: recv_type.unspecialized(), state });
let cfun = unsafe { get_mct_func(cfunc) }.cast();
let mut cfunc_args = vec![self_val];
cfunc_args.append(&mut args);
@ -3344,8 +3344,7 @@ mod opt_tests {
v1:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
v2:StringExact = StringCopy v1
PatchPoint MethodRedefined(String@0x1008, bytesize@0x1010)
v8:StringExact[VALUE(0x1018)] = GuardType v2, StringExact[VALUE(0x1018)]
v9:Fixnum = CCall bytesize@0x1020, v2
v9:Fixnum = CCall bytesize@0x1018, v2
PatchPoint CalleeModifiedLocals(v9)
Return v9
"#]]);

4
zjit/src/hir_type/mod.rs
View File

@ -247,6 +247,10 @@ impl Type {
}
}
pub fn unspecialized(&self) -> Self {
Type { spec: Specialization::Any, ..*self }
}
pub fn fixnum_value(&self) -> Option<i64> {
if self.is_subtype(types::Fixnum) {
self.ruby_object().map(|val| val.as_fixnum())