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

Don't invalidate BOPs when aliases redefined

Browse Source 
Previously when redefining an alias of a BOP, we would unnecessarily
invalidate the bop. For example:

    class String
      alias len length
      private :len
    end

This commit avoids this by checking that the called_id on the method
entry matches the original_id on the definition.
This commit is contained in:
John Hawthorn 2021-12-14 13:20:45 -08:00
parent b7ae08992f
commit e307627b6c
Notes: git 2021-12-15 08:23:15 +09:00 
Merged: https://github.com/ruby/ruby/pull/5271
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vm.c
View File

@ -1863,8 +1863,13 @@ rb_vm_check_optimizable_mid(VALUE mid)
}
static int
vm_redefinition_check_method_type(const rb_method_definition_t *def)
vm_redefinition_check_method_type(const rb_method_entry_t *me)
{
if (me->called_id != me->def->original_id) {
return FALSE;
}
const rb_method_definition_t *def = me->def;
switch (def->type) {
case VM_METHOD_TYPE_CFUNC:
case VM_METHOD_TYPE_OPTIMIZED:
@ -1882,7 +1887,7 @@ rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass)
RB_TYPE_P(RBASIC_CLASS(klass), T_CLASS)) {
klass = RBASIC_CLASS(klass);
}
if (vm_redefinition_check_method_type(me->def)) {
if (vm_redefinition_check_method_type(me)) {
if (st_lookup(vm_opt_method_def_table, (st_data_t)me->def, &bop)) {
int flag = vm_redefinition_check_flag(klass);
if (flag != 0) {
@ -1917,7 +1922,7 @@ add_opt_method(VALUE klass, ID mid, VALUE bop)
{
const rb_method_entry_t *me = rb_method_entry_at(klass, mid);
if (me && vm_redefinition_check_method_type(me->def)) {
if (me && vm_redefinition_check_method_type(me)) {
st_insert(vm_opt_method_def_table, (st_data_t)me->def, (st_data_t)bop);
st_insert(vm_opt_mid_table, (st_data_t)mid, (st_data_t)Qtrue);
}