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

Primitive.mandatory_only? consider splat args

Browse Source 
`vm_ci_argc` gives the number of arguments, but `*[1, 2, 3]` only
counts for one.
This commit is contained in:
Jean Boussier 2021-11-16 11:33:39 +01:00 committed by Koichi Sasada
parent 5b6a397f3e
commit 1af8ed5f0a
Notes: git 2021-11-17 06:38:24 +09:00 
Merged: https://github.com/ruby/ruby/pull/5124
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/ruby/test_time.rb
View File

@ -241,6 +241,10 @@ class TestTime < Test::Unit::TestCase
assert_equal(1, Time.at(0, 0.001).nsec) assert_equal(1, Time.at(0, 0.001).nsec)
end end
def test_at_splat
assert_equal(Time.at(1, 2), Time.at(*[1, 2]))
end
def test_at_with_unit def test_at_with_unit
assert_equal(123456789, Time.at(0, 123456789, :nanosecond).nsec) assert_equal(123456789, Time.at(0, 123456789, :nanosecond).nsec)
assert_equal(123456789, Time.at(0, 123456789, :nsec).nsec) assert_equal(123456789, Time.at(0, 123456789, :nsec).nsec)

6
vm_insnhelper.c
View File

@ -1848,8 +1848,10 @@ vm_search_cc(const VALUE klass, const struct rb_callinfo * const ci)
} }
} }
if ((cme->def->iseq_overload && if (cme->def->iseq_overload &&
(int)vm_ci_argc(ci) == method_entry_iseqptr(cme)->body->param.lead_num)) { (vm_ci_flag(ci) & (VM_CALL_ARGS_SIMPLE)) &&
(int)vm_ci_argc(ci) == method_entry_iseqptr(cme)->body->param.lead_num
) {
// use alternative // use alternative
cme = overloaded_cme(cme); cme = overloaded_cme(cme);
METHOD_ENTRY_CACHED_SET((struct rb_callable_method_entry_struct *)cme); METHOD_ENTRY_CACHED_SET((struct rb_callable_method_entry_struct *)cme);