summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/ruby/test_iseq.rb7
-rw-r--r--vm_eval.c13
2 files changed, 16 insertions, 4 deletions
diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
index 847ce6995c..ac191531de 100644
--- a/test/ruby/test_iseq.rb
+++ b/test/ruby/test_iseq.rb
@@ -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
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; 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);