Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Differentiate T_ARRAY and array subclasses #7091

Merged
merged 2 commits into from Jan 10, 2023
Merged

Differentiate T_ARRAY and array subclasses #7091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e4b235
Differentiate T_ARRAY and array subclasses
tenderlove Jan 9, 2023
d2dc344
Update yjit/src/core.rs
maximecb Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions yjit/src/codegen.rs
View file
Open in desktop
Expand Up @@ -1161,7 +1161,7 @@ fn gen_newarray(
);

ctx.stack_pop(n.as_usize());
let stack_ret = ctx.stack_push(Type::Array);
let stack_ret = ctx.stack_push(Type::CArray);
asm.mov(stack_ret, new_ary);

KeepCompiling
Expand All @@ -1185,7 +1185,7 @@ fn gen_duparray(
vec![ary.into()],
);

let stack_ret = ctx.stack_push(Type::Array);
let stack_ret = ctx.stack_push(Type::CArray);
asm.mov(stack_ret, new_ary);

KeepCompiling
Expand Down Expand Up @@ -1231,7 +1231,7 @@ fn gen_splatarray(
// Call rb_vm_splat_array(flag, ary)
let ary = asm.ccall(rb_vm_splat_array as *const u8, vec![flag.into(), ary_opnd]);

let stack_ret = ctx.stack_push(Type::Array);
let stack_ret = ctx.stack_push(Type::TArray);
asm.mov(stack_ret, ary);

KeepCompiling
Expand All @@ -1255,7 +1255,7 @@ fn gen_concatarray(
// Call rb_vm_concat_array(ary1, ary2st)
let ary = asm.ccall(rb_vm_concat_array as *const u8, vec![ary1_opnd, ary2st_opnd]);

let stack_ret = ctx.stack_push(Type::Array);
let stack_ret = ctx.stack_push(Type::TArray);
asm.mov(stack_ret, ary);

KeepCompiling
Expand Down Expand Up @@ -3886,6 +3886,8 @@ fn jit_guard_known_klass(

if known_klass == unsafe { rb_cString } {
ctx.upgrade_opnd_type(insn_opnd, Type::CString);
} else if known_klass == unsafe { rb_cArray } {
ctx.upgrade_opnd_type(insn_opnd, Type::CArray);
}
}
}
Expand Down
20 changes: 16 additions & 4 deletions yjit/src/core.rs
View file
Open in desktop
Expand Up @@ -35,7 +35,6 @@ pub enum Type {
False,
Fixnum,
Flonum,
Array,
Hash,
ImmSymbol,

Expand All @@ -44,6 +43,8 @@ pub enum Type {

TString, // An object with the T_STRING flag set, possibly an rb_cString
CString, // An un-subclassed string of type rb_cString (can have instance vars in some cases)
TArray, // An object with the T_ARRAY flag set, possibly an rb_cArray
CArray, // An un-subclassed string of type rb_cArray (can have instance vars in some cases)

BlockParamProxy, // A special sentinel value indicating the block parameter should be read from
// the current surrounding cfp
Expand Down Expand Up @@ -82,14 +83,18 @@ impl Type {
if val.class_of() == unsafe { rb_cString } {
return Type::CString;
}
#[cfg(not(test))]
if val.class_of() == unsafe { rb_cArray } {
return Type::CArray;
}
// We likewise can't reference rb_block_param_proxy, but it's again an optimisation;
// we can just treat it as a normal Object.
#[cfg(not(test))]
if val == unsafe { rb_block_param_proxy } {
return Type::BlockParamProxy;
}
match val.builtin_type() {
RUBY_T_ARRAY => Type::Array,
RUBY_T_ARRAY => Type::TArray,
RUBY_T_HASH => Type::Hash,
RUBY_T_STRING => Type::TString,
_ => Type::UnknownHeap,
Expand Down Expand Up @@ -130,7 +135,8 @@ impl Type {
pub fn is_heap(&self) -> bool {
match self {
Type::UnknownHeap => true,
Type::Array => true,
Type::TArray => true,
Type::CArray => true,
Type::Hash => true,
Type::HeapSymbol => true,
Type::TString => true,
Expand All @@ -147,7 +153,7 @@ impl Type {
Type::False => Some(RUBY_T_FALSE),
Type::Fixnum => Some(RUBY_T_FIXNUM),
Type::Flonum => Some(RUBY_T_FLOAT),
Type::Array => Some(RUBY_T_ARRAY),
Type::TArray | Type::CArray => Some(RUBY_T_ARRAY),
Type::Hash => Some(RUBY_T_HASH),
Type::ImmSymbol | Type::HeapSymbol => Some(RUBY_T_SYMBOL),
Type::TString | Type::CString => Some(RUBY_T_STRING),
Expand All @@ -167,6 +173,7 @@ impl Type {
Type::Flonum => Some(rb_cFloat),
Type::ImmSymbol | Type::HeapSymbol => Some(rb_cSymbol),
Type::CString => Some(rb_cString),
Type::CArray => Some(rb_cArray),
_ => None,
}
}
Expand Down Expand Up @@ -224,6 +231,11 @@ impl Type {
return 1;
}

// A CArray is also a TArray.
if self == Type::CArray && dst == Type::TArray {
return 1;
}

// Specific heap type into unknown heap type is imperfect but valid
if self.is_heap() && dst == Type::UnknownHeap {
return 1;
Expand Down