From e984c2a9ea29fa17c5f55d324d181f8eaa677d69 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Thu, 25 Nov 2021 15:57:36 +0900 Subject: fix to choose correct callcache 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 --- vm_eval.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'vm_eval.c') diff --git a/vm_eval.c b/vm_eval.c index 983baf7de6..73739fc3a5 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -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; ilen; 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); -- cgit v1.2.3