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

fix to choose correct callcache

Browse Source 
It should retun general `cc`, not for overloaded (mandatory only)
method call cache.

This issue is reported by @shugo and @ktou
https://twitter.com/shugomaeda/status/1463699797182119936
This commit is contained in:
Koichi Sasada 2021-11-25 15:57:36 +09:00
parent f3320f164f
commit e984c2a9ea
Notes: git 2021-11-26 10:56:24 +09:00 
Merged: https://github.com/ruby/ruby/pull/5173
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/ruby/test_iseq.rb
View File

@ -714,4 +714,11 @@ class TestISeq < Test::Unit::TestCase
RubyVM::InstructionSequence.compile("", debug_level: 5)
end;
end
def test_mandatory_only
assert_separately [], <<~RUBY
at0 = Time.at(0)
assert_equal at0, Time.public_send(:at, 0, 0)
RUBY
end
end

13
vm_eval.c
View File

@ -382,7 +382,7 @@ static inline enum method_missing_reason rb_method_call_status(rb_execution_cont
static const struct rb_callcache *
cc_new(VALUE klass, ID mid, int argc, const rb_callable_method_entry_t *cme)
{
const struct rb_callcache *cc;
const struct rb_callcache *cc = NULL;
RB_VM_LOCK_ENTER();
{
@ -399,10 +399,15 @@ cc_new(VALUE klass, ID mid, int argc, const rb_callable_method_entry_t *cme)
rb_id_table_insert(cc_tbl, mid, (VALUE)ccs);
}
if (ccs->len > 0) {
cc = ccs->entries[0].cc;
for (int i=0; i<ccs->len; i++) {
cc = ccs->entries[i].cc;
if (vm_cc_cme(cc) == cme) {
break;
}
cc = NULL;
}
else {
if (cc == NULL) {
const struct rb_callinfo *ci = vm_ci_new(mid, 0, argc, false); // TODO: proper ci
cc = vm_cc_new(klass, cme, vm_call_general);
METHOD_ENTRY_CACHED_SET((struct rb_callable_method_entry_struct *)cme);