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

pass CI to gccct_method_search_slowpath

Browse Source 
Also the slow path only needs to look up the method once: via
vm_search_method_slowpath0.  gccct just returns whatever cc normal
method lookup does.
This commit is contained in:
Aaron Patterson 2024-04-24 10:02:06 -07:00 committed by Aaron Patterson
parent 58847b7df8
commit 2cc59c1b31
1 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
vm_eval.c
View File

@ -400,46 +400,19 @@ gccct_hash(VALUE klass, ID mid)
return (klass >> 3) ^ (VALUE)mid; return (klass >> 3) ^ (VALUE)mid;
} }
NOINLINE(static const struct rb_callcache *gccct_method_search_slowpath(rb_vm_t *vm, VALUE klass, ID mid, int argc, unsigned int index, call_type scope)); NOINLINE(static const struct rb_callcache *gccct_method_search_slowpath(rb_vm_t *vm, VALUE klass, unsigned int index, const struct rb_callinfo * ci));
static const struct rb_callcache * static const struct rb_callcache *
gccct_method_search_slowpath(rb_vm_t *vm, VALUE klass, ID mid, int argc, unsigned int index, call_type scope) gccct_method_search_slowpath(rb_vm_t *vm, VALUE klass, unsigned int index, const struct rb_callinfo *ci)
{ {
const rb_callable_method_entry_t *cme = rb_callable_method_entry(klass, mid);
const struct rb_callcache *cc;
int flags = 0;
switch(scope) {
case CALL_PUBLIC:
break;
case CALL_FCALL:
flags |= VM_CALL_FCALL;
break;
case CALL_VCALL:
flags |= VM_CALL_VCALL;
break;
case CALL_PUBLIC_KW:
flags |= VM_CALL_KWARG;
break;
case CALL_FCALL_KW:
flags |= (VM_CALL_KWARG | VM_CALL_FCALL);
break;
}
struct rb_call_data cd = { struct rb_call_data cd = {
.ci = &VM_CI_ON_STACK(mid, flags, argc, NULL), .ci = ci,
.cc = NULL .cc = NULL
}; };
if (cme != NULL) { vm_search_method_slowpath0(vm->self, &cd, klass);
vm_search_method_slowpath0(vm->self, &cd, klass);
cc = cd.cc;
}
else {
cc = NULL;
}
return vm->global_cc_cache_table[index] = cc; return vm->global_cc_cache_table[index] = cd.cc;
} }
static inline const struct rb_callcache * static inline const struct rb_callcache *
@ -478,7 +451,27 @@ gccct_method_search(rb_execution_context_t *ec, VALUE recv, ID mid, int argc, ca
} }
RB_DEBUG_COUNTER_INC(gccct_miss); RB_DEBUG_COUNTER_INC(gccct_miss);
return gccct_method_search_slowpath(vm, klass, mid, argc, index, call_scope);
int flags = 0;
switch(call_scope) {
case CALL_PUBLIC:
break;
case CALL_FCALL:
flags |= VM_CALL_FCALL;
break;
case CALL_VCALL:
flags |= VM_CALL_VCALL;
break;
case CALL_PUBLIC_KW:
flags |= VM_CALL_KWARG;
break;
case CALL_FCALL_KW:
flags |= (VM_CALL_KWARG | VM_CALL_FCALL);
break;
}
return gccct_method_search_slowpath(vm, klass, index, &VM_CI_ON_STACK(mid, flags, argc, NULL));
} }
/** /**