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

YJIT: Initial implementation of splat with optional params (#7166)

Browse Source
This commit is contained in:
Jimmy Miller 2023-01-30 15:51:55 -05:00 committed by GitHub
parent c4cc3be195
commit b32e1169c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2023-01-30 20:52:20 +00:00 
Merged-By: maximecb <maximecb@ruby-lang.org>
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
yjit/src/codegen.rs
View File

@ -5147,12 +5147,6 @@ fn gen_send_iseq(
let opt_num = unsafe { get_iseq_body_param_opt_num(iseq) }; let opt_num = unsafe { get_iseq_body_param_opt_num(iseq) };
let opts_missing: i32 = opt_num - opts_filled; let opts_missing: i32 = opt_num - opts_filled;
if opt_num > 0 && flags & VM_CALL_ARGS_SPLAT != 0 {
gen_counter_incr!(asm, send_iseq_splat_with_opt);
return CantCompile;
}
if doing_kw_call && flags & VM_CALL_ARGS_SPLAT != 0 { if doing_kw_call && flags & VM_CALL_ARGS_SPLAT != 0 {
gen_counter_incr!(asm, send_iseq_splat_with_kw); gen_counter_incr!(asm, send_iseq_splat_with_kw);
return CantCompile; return CantCompile;
@ -5198,13 +5192,24 @@ fn gen_send_iseq(
return CantCompile; return CantCompile;
} }
if opt_num > 0 { if opt_num > 0 && flags & VM_CALL_ARGS_SPLAT == 0 {
num_params -= opts_missing as u32; num_params -= opts_missing as u32;
unsafe { unsafe {
let opt_table = get_iseq_body_param_opt_table(iseq); let opt_table = get_iseq_body_param_opt_table(iseq);
start_pc_offset = (*opt_table.offset(opts_filled as isize)).as_u32(); start_pc_offset = (*opt_table.offset(opts_filled as isize)).as_u32();
} }
} } else if opt_num > 0 && flags & VM_CALL_ARGS_SPLAT != 0 {
// We are going to assume that args_splat fills all of the optional arguments.
// We should actually get the array length instead at compile time.
// We don't set num_params here because we use it for the splat.
// If our assumption is wrong, we will exit early in the splat code.
// We could do that a bit smarter and not exit but instead change
// the offset we jump to. But we aren't currently doing that.
unsafe {
let opt_table = get_iseq_body_param_opt_table(iseq);
start_pc_offset = (*opt_table.offset(opt_num as isize)).as_u32();
};
};
if doing_kw_call { if doing_kw_call {
// Here we're calling a method with keyword arguments and specifying // Here we're calling a method with keyword arguments and specifying