diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-26 10:28:21 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-26 10:28:21 +0000 |
commit | be5564a178ee453b7d6fedc7c312bec01e29dde2 (patch) | |
tree | ae1387d18aa71ee6359c1bfc6e055b216f090908 /vm_eval.c | |
parent | 78e86f75ed7ba5b7cd0cbdd85b27c98e271fd2fc (diff) | |
download | ruby-be5564a178ee453b7d6fedc7c312bec01e29dde2.tar.gz |
* vm_insnhelper.c: introduce rb_vm_pop_frame() and use it
instead of setting rb_thread_t::cfp directly.
* vm_insnhelper.c (vm_pop_frame): return the result of
finish frame or not.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55755 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
-rw-r--r-- | vm_eval.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -95,7 +95,7 @@ vm_call0_cfunc(rb_thread_t* th, struct rb_calling_info *calling, const struct rb rb_bug("vm_call0_cfunc: cfp consistency error"); } VM_PROFILE_UP(C2C_POPF); - vm_pop_frame(th); + rb_vm_pop_frame(th); } } EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, calling->recv, ci->mid, callnig->cc->me->owner, val); @@ -134,7 +134,7 @@ vm_call0_cfunc_with_frame(rb_thread_t* th, struct rb_calling_info *calling, cons rb_bug("vm_call0_cfunc_with_frame: cfp consistency error"); } VM_PROFILE_UP(C2C_POPF); - vm_pop_frame(th); + rb_vm_pop_frame(th); } EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, mid, me->owner, val); RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, me->owner, mid); |