diff options
Diffstat (limited to 'vm_eval.c')
-rw-r--r-- | vm_eval.c | 46 |
1 files changed, 31 insertions, 15 deletions
@@ -179,7 +179,14 @@ vm_call0_body(rb_thread_t* th, rb_call_info_t *ci, const VALUE *argv) case VM_METHOD_TYPE_BMETHOD: return vm_call_bmethod_body(th, ci, argv); case VM_METHOD_TYPE_ZSUPER: + case VM_METHOD_TYPE_REFINED: { + if (ci->me->def->type == VM_METHOD_TYPE_REFINED && + ci->me->def->body.orig_me) { + ci->me = ci->me->def->body.orig_me; + goto again; + } + ci->defined_class = RCLASS_SUPER(ci->defined_class); if (!ci->defined_class || !(ci->me = rb_method_entry(ci->defined_class, ci->mid, &ci->defined_class))) { @@ -274,8 +281,7 @@ stack_check(void) } static inline rb_method_entry_t * - rb_search_method_entry(VALUE refinements, VALUE recv, ID mid, - VALUE *defined_class_ptr); + rb_search_method_entry(VALUE recv, ID mid, VALUE *defined_class_ptr); static inline int rb_method_call_status(rb_thread_t *th, const rb_method_entry_t *me, call_type scope, VALUE self); #define NOEX_OK NOEX_NOSUPER @@ -296,11 +302,11 @@ static inline int rb_method_call_status(rb_thread_t *th, const rb_method_entry_t */ static inline VALUE rb_call0(VALUE recv, ID mid, int argc, const VALUE *argv, - call_type scope, VALUE self, VALUE refinements) + call_type scope, VALUE self) { VALUE defined_class; rb_method_entry_t *me = - rb_search_method_entry(refinements, recv, mid, &defined_class); + rb_search_method_entry(recv, mid, &defined_class); rb_thread_t *th = GET_THREAD(); int call_status = rb_method_call_status(th, me, scope, self); @@ -364,7 +370,7 @@ check_funcall(VALUE recv, ID mid, int argc, VALUE *argv) } } - me = rb_search_method_entry(Qnil, recv, mid, &defined_class); + me = rb_search_method_entry(recv, mid, &defined_class); call_status = rb_method_call_status(th, me, CALL_FCALL, th->cfp->self); if (call_status != NOEX_OK) { if (rb_method_basic_definition_p(klass, idMethodMissing)) { @@ -429,8 +435,7 @@ rb_type_str(enum ruby_value_type type) } static inline rb_method_entry_t * -rb_search_method_entry(VALUE refinements, VALUE recv, ID mid, - VALUE *defined_class_ptr) +rb_search_method_entry(VALUE recv, ID mid, VALUE *defined_class_ptr) { VALUE klass = CLASS_OF(recv); @@ -469,8 +474,7 @@ rb_search_method_entry(VALUE refinements, VALUE recv, ID mid, rb_id2name(mid), type, (void *)recv, flags, klass); } } - return rb_method_entry_get_with_refinements(refinements, klass, mid, - defined_class_ptr); + return rb_method_entry(klass, mid, defined_class_ptr); } static inline int @@ -532,7 +536,7 @@ static inline VALUE rb_call(VALUE recv, ID mid, int argc, const VALUE *argv, call_type scope) { rb_thread_t *th = GET_THREAD(); - return rb_call0(recv, mid, argc, argv, scope, th->cfp->self, Qnil); + return rb_call0(recv, mid, argc, argv, scope, th->cfp->self); } NORETURN(static void raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv, @@ -785,11 +789,23 @@ rb_funcall_passing_block_with_refinements(VALUE recv, ID mid, int argc, const VALUE *argv, VALUE refinements) { - rb_thread_t *th = GET_THREAD(); + VALUE defined_class; + rb_method_entry_t *me = + rb_search_method_entry(recv, mid, &defined_class); + rb_thread_t *th; + int call_status; - PASS_PASSED_BLOCK_TH(th); - return rb_call0(recv, mid, argc, argv, CALL_PUBLIC, th->cfp->self, - refinements); + if (me && me->def->type == VM_METHOD_TYPE_REFINED) { + me = rb_resolve_refined_method(refinements, me, &defined_class); + } + PASS_PASSED_BLOCK_TH(GET_THREAD()); + th = GET_THREAD(); + call_status = rb_method_call_status(th, me, CALL_PUBLIC, th->cfp->self); + if (call_status != NOEX_OK) { + return method_missing(recv, mid, argc, argv, call_status); + } + stack_check(); + return vm_call0(th, recv, mid, argc, argv, me, defined_class); } static VALUE @@ -823,7 +839,7 @@ send_internal(int argc, const VALUE *argv, VALUE recv, call_type scope) id = rb_to_id(vid); } PASS_PASSED_BLOCK_TH(th); - return rb_call0(recv, id, argc, argv, scope, self, Qnil); + return rb_call0(recv, id, argc, argv, scope, self); } /* |