diff options
author | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-03 09:41:38 +0000 |
---|---|---|
committer | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-03 09:41:38 +0000 |
commit | 65b746bec045ec94ec762fbb9187fbd3a8860716 (patch) | |
tree | 3ba6fe304391261f8c7bd5c2cd8d4e6525fc09d7 /vm.c | |
parent | 049ace5888174d5c2680a9203a8e3f24e928f2b9 (diff) | |
download | ruby-65b746bec045ec94ec762fbb9187fbd3a8860716.tar.gz |
* vm.c (rb_vm_rewrite_ep_in_errinfo, vm_rewrite_ep_in_errinfo):
merge code and remove `rb_vm_rewrite_ep_in_errinfo'.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 47 |
1 files changed, 21 insertions, 26 deletions
@@ -477,13 +477,15 @@ vm_collect_local_variables_in_heap(rb_thread_t *th, VALUE *ep, VALUE ary) } } +static void vm_rewrite_ep_in_errinfo(rb_thread_t *th); + VALUE rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp) { VALUE envval; envval = vm_make_env_each(th, cfp, cfp->ep, VM_CF_LEP(cfp)); - rb_vm_rewrite_ep_in_errinfo(th, th->cfp); + vm_rewrite_ep_in_errinfo(th); if (PROCDEBUG) { check_env_value(envval); @@ -492,36 +494,29 @@ rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp) return envval; } -static void vm_rewrite_ep_in_errinfo(rb_thread_t *th, rb_control_frame_t *cfp); - -void -rb_vm_rewrite_ep_in_errinfo(rb_thread_t *th, rb_control_frame_t *cfp) +static void +vm_rewrite_ep_in_errinfo(rb_thread_t *th) { + rb_control_frame_t *cfp = th->cfp; while (!RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th, cfp)) { - vm_rewrite_ep_in_errinfo(th, cfp); - cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); - } -} - -static void -vm_rewrite_ep_in_errinfo(rb_thread_t *th, rb_control_frame_t *cfp) -{ - /* rewrite ep in errinfo to point to heap */ - if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq) && - (cfp->iseq->type == ISEQ_TYPE_RESCUE || - cfp->iseq->type == ISEQ_TYPE_ENSURE)) { - VALUE errinfo = cfp->ep[-2]; /* #$! */ - if (RB_TYPE_P(errinfo, T_NODE)) { - VALUE *escape_ep = GET_THROWOBJ_CATCH_POINT(errinfo); - if (! ENV_IN_HEAP_P(th, escape_ep)) { - VALUE epval = *escape_ep; - if (!SPECIAL_CONST_P(epval) && RBASIC(epval)->klass == rb_cEnv) { - rb_env_t *epenv; - GetEnvPtr(epval, epenv); - SET_THROWOBJ_CATCH_POINT(errinfo, (VALUE)(epenv->env + epenv->local_size)); + /* rewrite ep in errinfo to point to heap */ + if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq) && + (cfp->iseq->type == ISEQ_TYPE_RESCUE || + cfp->iseq->type == ISEQ_TYPE_ENSURE)) { + VALUE errinfo = cfp->ep[-2]; /* #$! */ + if (RB_TYPE_P(errinfo, T_NODE)) { + VALUE *escape_ep = GET_THROWOBJ_CATCH_POINT(errinfo); + if (! ENV_IN_HEAP_P(th, escape_ep)) { + VALUE epval = *escape_ep; + if (!SPECIAL_CONST_P(epval) && RBASIC(epval)->klass == rb_cEnv) { + rb_env_t *epenv; + GetEnvPtr(epval, epenv); + SET_THROWOBJ_CATCH_POINT(errinfo, (VALUE)(epenv->env + epenv->local_size)); + } } } } + cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); } } |