* eval.c (frame_called_id): it should use vm_ifunc type.

* eval.c (frame_func_id): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2015-03-11 13:37:15 +00:00
parent 7790f37efd
commit eabfb049f4
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,9 @@
Wed Mar 11 22:36:34 2015 Koichi Sasada <ko1@atdot.net>
* eval.c (frame_called_id): it should use vm_ifunc type.
* eval.c (frame_func_id): ditto.
Wed Mar 11 22:27:05 2015 Koichi Sasada <ko1@atdot.net> Wed Mar 11 22:27:05 2015 Koichi Sasada <ko1@atdot.net>
* node.h: remove NODE_IFUNC, NEW_IFUNC. * node.h: remove NODE_IFUNC, NEW_IFUNC.

8
eval.c
View File

@ -946,8 +946,8 @@ frame_func_id(rb_control_frame_t *cfp)
} }
while (iseq) { while (iseq) {
if (RUBY_VM_IFUNC_P(iseq)) { if (RUBY_VM_IFUNC_P(iseq)) {
NODE *ifunc = (NODE *)iseq; const struct vm_ifunc *ifunc = (struct vm_ifunc *)iseq;
if (ifunc->nd_aid) return ifunc->nd_aid; if (ifunc->id) return ifunc->id;
return idIFUNC; return idIFUNC;
} }
me_local = method_entry_of_iseq(cfp, iseq); me_local = method_entry_of_iseq(cfp, iseq);
@ -976,8 +976,8 @@ frame_called_id(rb_control_frame_t *cfp)
} }
while (iseq) { while (iseq) {
if (RUBY_VM_IFUNC_P(iseq)) { if (RUBY_VM_IFUNC_P(iseq)) {
NODE *ifunc = (NODE *)iseq; const struct vm_ifunc *ifunc = (struct vm_ifunc *)iseq;
if (ifunc->nd_aid) return ifunc->nd_aid; if (ifunc->id) return ifunc->id;
return idIFUNC; return idIFUNC;
} }
me_local = method_entry_of_iseq(cfp, iseq); me_local = method_entry_of_iseq(cfp, iseq);