diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | vm_insnhelper.c | 7 |
2 files changed, 3 insertions, 8 deletions
@@ -1,7 +1,3 @@ -Sat Oct 31 10:31:23 2015 Koichi Sasada <ko1@atdot.net> - - * vm_insnhelper.c (vm_search_super_method): do not touch `ci' here. - Sat Oct 31 10:22:49 2015 yui-knk <spiketeika@gmail.com> * eval_error.c (undef_mesg_for): fix typo. Before this commit diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 9f3c00d6c9..4130c17749 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -2246,12 +2246,11 @@ vm_super_outside(void) static void vm_search_super_method(rb_thread_t *th, rb_control_frame_t *reg_cfp, - struct rb_calling_info *calling, const struct rb_call_info *ci, struct rb_call_cache *cc) + struct rb_calling_info *calling, struct rb_call_info *ci, struct rb_call_cache *cc) { VALUE current_defined_class, klass; VALUE sigval = TOPN(calling->argc); const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(reg_cfp); - ID mid; if (!me) { vm_super_outside(); @@ -2283,7 +2282,7 @@ vm_search_super_method(rb_thread_t *th, rb_control_frame_t *reg_cfp, " Specify all arguments explicitly."); } - mid = me->def->original_id; + ci->mid = me->def->original_id; klass = vm_search_normal_superclass(me->defined_class); if (!klass) { @@ -2293,7 +2292,7 @@ vm_search_super_method(rb_thread_t *th, rb_control_frame_t *reg_cfp, } else { /* TODO: use inline cache */ - cc->me = rb_callable_method_entry(klass, mid); + cc->me = rb_callable_method_entry(klass, ci->mid); CI_SET_FASTPATH(cc, vm_call_super_method, 1); } } |