diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-04 02:11:37 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-04 02:11:37 +0000 |
commit | a7e1820a9f9c0b6c84c281c171c105a34aa16738 (patch) | |
tree | 5de8ea761af4e4ac30dc229518093bacc55d2ee2 /vm.c | |
parent | 07132e0675ecacd9215504e9f9631fa1f83b7670 (diff) | |
download | ruby-a7e1820a9f9c0b6c84c281c171c105a34aa16738.tar.gz |
__callee__ fix
* eval.c (rb_frame_callee, rb_f_callee_name): fix to return the called
id.
* vm_insnhelper.c (vm_push_frame): set proper method entry.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36301 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -137,7 +137,7 @@ vm_set_top_stack(rb_thread_t * th, VALUE iseqval) CHECK_STACK_OVERFLOW(th->cfp, iseq->local_size + iseq->stack_max); vm_push_frame(th, iseq, VM_FRAME_MAGIC_TOP | VM_FRAME_FLAG_FINISH, th->top_self, VM_ENVVAL_BLOCK_PTR(0), iseq->iseq_encoded, - th->cfp->sp, iseq->local_size); + th->cfp->sp, iseq->local_size, 0); } static void @@ -149,7 +149,7 @@ vm_set_eval_stack(rb_thread_t * th, VALUE iseqval, const NODE *cref, rb_block_t CHECK_STACK_OVERFLOW(th->cfp, iseq->local_size + iseq->stack_max); vm_push_frame(th, iseq, VM_FRAME_MAGIC_EVAL | VM_FRAME_FLAG_FINISH, base_block->self, VM_ENVVAL_PREV_EP_PTR(base_block->ep), iseq->iseq_encoded, - th->cfp->sp, iseq->local_size); + th->cfp->sp, iseq->local_size, 0); if (cref) { th->cfp->ep[-1] = (VALUE)cref; @@ -598,8 +598,8 @@ invoke_block_from_c(rb_thread_t *th, const rb_block_t *block, ncfp = vm_push_frame(th, iseq, type | VM_FRAME_FLAG_FINISH, self, VM_ENVVAL_PREV_EP_PTR(block->ep), - iseq->iseq_encoded + opt_pc, cfp->sp + arg_size, iseq->local_size - arg_size); - ncfp->me = th->passed_me; + iseq->iseq_encoded + opt_pc, cfp->sp + arg_size, iseq->local_size - arg_size, + th->passed_me); th->passed_me = 0; th->passed_block = blockptr; @@ -1304,7 +1304,8 @@ vm_exec(rb_thread_t *th) cfp->sp[0] = err; vm_push_frame(th, catch_iseq, VM_FRAME_MAGIC_BLOCK, cfp->self, VM_ENVVAL_PREV_EP_PTR(cfp->ep), catch_iseq->iseq_encoded, - cfp->sp + 1 /* push value */, catch_iseq->local_size - 1); + cfp->sp + 1 /* push value */, catch_iseq->local_size - 1, + cfp->me); state = 0; th->state = 0; @@ -1438,7 +1439,7 @@ rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, VALUE val; vm_push_frame(th, DATA_PTR(iseqval), VM_FRAME_MAGIC_TOP | VM_FRAME_FLAG_FINISH, - recv, VM_ENVVAL_BLOCK_PTR(blockptr), 0, reg_cfp->sp, 1); + recv, VM_ENVVAL_BLOCK_PTR(blockptr), 0, reg_cfp->sp, 1, 0); val = (*func)(arg); @@ -1782,7 +1783,7 @@ th_init(rb_thread_t *th, VALUE self) th->cfp = (void *)(th->stack + th->stack_size); vm_push_frame(th, 0 /* dummy iseq */, VM_FRAME_MAGIC_TOP | VM_FRAME_FLAG_FINISH, - Qnil /* dummy self */, VM_ENVVAL_BLOCK_PTR(0), 0 /* dummy pc */, th->stack, 1); + Qnil /* dummy self */, VM_ENVVAL_BLOCK_PTR(0), 0 /* dummy pc */, th->stack, 1, 0); th->status = THREAD_RUNNABLE; th->errinfo = Qnil; |