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

* vm_insnhelper.c (vm_call_method0): use switch() for visibilities

Browse Source 
(for readability).



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52061 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2015-10-06 10:25:25 +00:00
parent 7432df370d
commit 603210060c
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Oct 6 19:24:38 2015 Koichi Sasada <ko1@atdot.net>
* vm_insnhelper.c (vm_call_method0): use switch() for visibilities
(for readability).
Tue Oct 6 19:23:58 2015 Koichi Sasada <ko1@atdot.net> Tue Oct 6 19:23:58 2015 Koichi Sasada <ko1@atdot.net>
* proc.c (Init_Proc): Proc#call and others should be public. * proc.c (Init_Proc): Proc#call and others should be public.

22
vm_insnhelper.c
View File

@ -2114,12 +2114,12 @@ vm_call_method0(rb_thread_t *th, rb_control_frame_t *cfp, struct rb_calling_info
VM_ASSERT(callable_method_entry_p(cc->me)); VM_ASSERT(callable_method_entry_p(cc->me));
if (cc->me != NULL) { if (cc->me != NULL) {
if (LIKELY(METHOD_ENTRY_VISI(cc->me) == METHOD_VISI_PUBLIC)) { switch (METHOD_ENTRY_VISI(cc->me)) {
VM_ASSERT(callable_method_entry_p(cc->me)); case METHOD_VISI_PUBLIC: /* likely */
return vm_call_method_each_type(th, cfp, calling, ci, cc, enable_fastpath); return vm_call_method_each_type(th, cfp, calling, ci, cc, enable_fastpath);
}
else { case METHOD_VISI_PRIVATE:
if (!(ci->flag & VM_CALL_FCALL) && (METHOD_ENTRY_VISI(cc->me) == METHOD_VISI_PRIVATE)) { if (!(ci->flag & VM_CALL_FCALL)) {
enum method_missing_reason stat = MISSING_PRIVATE; enum method_missing_reason stat = MISSING_PRIVATE;
if (ci->flag & VM_CALL_VCALL) stat |= MISSING_VCALL; if (ci->flag & VM_CALL_VCALL) stat |= MISSING_VCALL;
@ -2127,7 +2127,10 @@ vm_call_method0(rb_thread_t *th, rb_control_frame_t *cfp, struct rb_calling_info
CI_SET_FASTPATH(cc, vm_call_method_missing, 1); CI_SET_FASTPATH(cc, vm_call_method_missing, 1);
return vm_call_method_missing(th, cfp, calling, ci, cc); return vm_call_method_missing(th, cfp, calling, ci, cc);
} }
else if (!(ci->flag & VM_CALL_OPT_SEND) && (METHOD_ENTRY_VISI(cc->me) == METHOD_VISI_PROTECTED)) { return vm_call_method_each_type(th, cfp, calling, ci, cc, enable_fastpath);
case METHOD_VISI_PROTECTED:
if (!(ci->flag & VM_CALL_OPT_SEND)) {
if (!rb_obj_is_kind_of(cfp->self, cc->me->defined_class)) { if (!rb_obj_is_kind_of(cfp->self, cc->me->defined_class)) {
cc->aux.method_missing_reason = MISSING_PROTECTED; cc->aux.method_missing_reason = MISSING_PROTECTED;
return vm_call_method_missing(th, cfp, calling, ci, cc); return vm_call_method_missing(th, cfp, calling, ci, cc);
@ -2137,16 +2140,15 @@ vm_call_method0(rb_thread_t *th, rb_control_frame_t *cfp, struct rb_calling_info
return vm_call_method_each_type(th, cfp, calling, ci, cc, FALSE); return vm_call_method_each_type(th, cfp, calling, ci, cc, FALSE);
} }
} }
else {
return vm_call_method_each_type(th, cfp, calling, ci, cc, enable_fastpath); return vm_call_method_each_type(th, cfp, calling, ci, cc, enable_fastpath);
}
default:
rb_bug("unreachable");
} }
} }
else { else {
return vm_call_method_nome(th, cfp, calling, ci, cc); return vm_call_method_nome(th, cfp, calling, ci, cc);
} }
rb_bug("vm_call_method: unreachable");
} }
static VALUE static VALUE