diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-08 09:04:07 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-08 09:04:07 +0000 |
commit | 0948eb62e68d559e0a42732c896fe9957b8d6b80 (patch) | |
tree | bd8c22137078177e6f6884be70832cfa141faf6a /vm.c | |
parent | c818e364dfdac96bf02d2ec491f786a65713a147 (diff) |
vm.c: respect redefinition of Proc#call
* vm.c (vm_redefinition_check_method_type): hoist out method
definition type to check redefinition.
* vm.c (rb_vm_check_redefinition_opt_method): should check
optimized method too.
* vm.c (vm_init_redefined_flag): check Proc#call.
* vm_insnhelper.c (vm_call_opt_block_call): search proper method
if redefined. [Bug #14335]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 19 |
1 files changed, 15 insertions, 4 deletions
@@ -1500,6 +1500,18 @@ vm_redefinition_check_flag(VALUE klass) return 0; } +static int +vm_redefinition_check_method_type(const rb_method_definition_t *def) +{ + switch (def->type) { + case VM_METHOD_TYPE_CFUNC: + case VM_METHOD_TYPE_OPTIMIZED: + return TRUE; + default: + return FALSE; + } +} + static void rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass) { @@ -1507,7 +1519,7 @@ rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass) if (RB_TYPE_P(klass, T_ICLASS) && FL_TEST(klass, RICLASS_IS_ORIGIN)) { klass = RBASIC_CLASS(klass); } - if (me->def->type == VM_METHOD_TYPE_CFUNC) { + if (vm_redefinition_check_method_type(me->def)) { if (st_lookup(vm_opt_method_table, (st_data_t)me, &bop)) { int flag = vm_redefinition_check_flag(klass); @@ -1540,9 +1552,7 @@ add_opt_method(VALUE klass, ID mid, VALUE bop) { const rb_method_entry_t *me = rb_method_entry_at(klass, mid); - if (me && - (me->def->type == VM_METHOD_TYPE_CFUNC || - me->def->type == VM_METHOD_TYPE_OPTIMIZED)) { + if (me && vm_redefinition_check_method_type(me->def)) { st_insert(vm_opt_method_table, (st_data_t)me, (st_data_t)bop); } else { @@ -1584,6 +1594,7 @@ vm_init_redefined_flag(void) OP(UMinus, UMINUS), (C(String)); OP(Max, MAX), (C(Array)); OP(Min, MIN), (C(Array)); + OP(Call, CALL), (C(Proc)); #undef C #undef OP } |