зеркало из https://github.com/github/ruby.git
YJIT: Rest and block_arg support (#7584)
This commit is contained in:
Родитель
27b1a2992f
Коммит
59c3fac6c4
|
@ -3779,3 +3779,24 @@ assert_equal "ArgumentError", %q{
|
|||
"ArgumentError"
|
||||
end
|
||||
}
|
||||
|
||||
# Rest with block
|
||||
# Simplified code from railsbench
|
||||
assert_equal '[{"/a"=>"b", :as=>:c, :via=>:post}, [], nil]', %q{
|
||||
def match(path, *rest, &block)
|
||||
[path, rest, block]
|
||||
end
|
||||
|
||||
def map_method(method, args, &block)
|
||||
options = args.last
|
||||
args.pop
|
||||
options[:via] = method
|
||||
match(*args, options, &block)
|
||||
end
|
||||
|
||||
def post(*args, &block)
|
||||
map_method(:post, args, &block)
|
||||
end
|
||||
|
||||
post "/a" => "b", as: :c
|
||||
}
|
||||
|
|
|
@ -5240,9 +5240,9 @@ fn move_rest_args_to_stack(array: Opnd, num_args: u32, ctx: &mut Context, asm: &
|
|||
|
||||
let array_len_opnd = get_array_len(asm, array);
|
||||
|
||||
asm.comment("Side exit if length doesn't not equal remaining args");
|
||||
asm.comment("Side exit if length is less than required");
|
||||
asm.cmp(array_len_opnd, num_args.into());
|
||||
asm.jbe(counted_exit!(ocb, side_exit, send_splatarray_length_not_equal));
|
||||
asm.jl(counted_exit!(ocb, side_exit, send_iseq_has_rest_and_splat_not_equal));
|
||||
|
||||
asm.comment("Push arguments from array");
|
||||
|
||||
|
@ -5472,11 +5472,6 @@ fn gen_send_iseq(
|
|||
return CantCompile;
|
||||
}
|
||||
|
||||
if iseq_has_rest && unsafe { get_iseq_flags_has_block(iseq) } {
|
||||
gen_counter_incr!(asm, send_iseq_has_rest_and_block);
|
||||
return CantCompile;
|
||||
}
|
||||
|
||||
if iseq_has_rest && unsafe { get_iseq_flags_has_kw(iseq) } {
|
||||
gen_counter_incr!(asm, send_iseq_has_rest_and_kw);
|
||||
return CantCompile;
|
||||
|
|
|
@ -253,11 +253,10 @@ make_counters! {
|
|||
send_send_getter,
|
||||
send_send_builtin,
|
||||
send_iseq_has_rest_and_captured,
|
||||
send_iseq_has_rest_and_splat_fewer,
|
||||
send_iseq_has_rest_and_send,
|
||||
send_iseq_has_rest_and_block,
|
||||
send_iseq_has_rest_and_kw,
|
||||
send_iseq_has_rest_and_optional,
|
||||
send_iseq_has_rest_and_splat_not_equal,
|
||||
send_is_a_class_mismatch,
|
||||
send_instance_of_class_mismatch,
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче