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

* vm_insnhelper.c (vm_search_super_method): do not touch `ci' here.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2015-10-31 01:32:02 +00:00
parent 9b18348293
commit f5b2da3a53
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
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

7
vm_insnhelper.c
View File

@ -2246,11 +2246,12 @@ 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, struct rb_call_info *ci, struct rb_call_cache *cc)
struct rb_calling_info *calling, const 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();
@ -2282,7 +2283,7 @@ vm_search_super_method(rb_thread_t *th, rb_control_frame_t *reg_cfp,
" Specify all arguments explicitly.");
}
ci->mid = me->def->original_id;
mid = me->def->original_id;
klass = vm_search_normal_superclass(me->defined_class);
if (!klass) {
@ -2292,7 +2293,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, ci->mid);
cc->me = rb_callable_method_entry(klass, mid);
CI_SET_FASTPATH(cc, vm_call_super_method, 1);
}
}