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

* vm.c (rb_vm_rewrite_ep_in_errinfo, vm_rewrite_ep_in_errinfo):

Browse Source 
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
This commit is contained in:
ktsj 2012-11-03 09:41:38 +00:00
parent 049ace5888
commit 65b746bec0
3 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Nov 3 18:35:55 2012 Kazuki Tsujimoto <kazuki@callcc.net>
* vm.c (rb_vm_rewrite_ep_in_errinfo, vm_rewrite_ep_in_errinfo):
merge code and remove `rb_vm_rewrite_ep_in_errinfo'.
Sat Nov 3 18:15:24 2012 Kazuki Tsujimoto <kazuki@callcc.net> Sat Nov 3 18:15:24 2012 Kazuki Tsujimoto <kazuki@callcc.net>
* vm.c, proc.c: avoid unnecessary `rb_vm_rewrite_ep_in_errinfo' * vm.c, proc.c: avoid unnecessary `rb_vm_rewrite_ep_in_errinfo'

47
vm.c
View File

@ -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 VALUE
rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp) rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp)
{ {
VALUE envval; VALUE envval;
envval = vm_make_env_each(th, cfp, cfp->ep, VM_CF_LEP(cfp)); 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) { if (PROCDEBUG) {
check_env_value(envval); check_env_value(envval);
@ -492,36 +494,29 @@ rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp)
return envval; 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)
{
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 static void
vm_rewrite_ep_in_errinfo(rb_thread_t *th, rb_control_frame_t *cfp) vm_rewrite_ep_in_errinfo(rb_thread_t *th)
{ {
/* rewrite ep in errinfo to point to heap */ rb_control_frame_t *cfp = th->cfp;
if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq) && while (!RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th, cfp)) {
(cfp->iseq->type == ISEQ_TYPE_RESCUE || /* rewrite ep in errinfo to point to heap */
cfp->iseq->type == ISEQ_TYPE_ENSURE)) { if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq) &&
VALUE errinfo = cfp->ep[-2]; /* #$! */ (cfp->iseq->type == ISEQ_TYPE_RESCUE ||
if (RB_TYPE_P(errinfo, T_NODE)) { cfp->iseq->type == ISEQ_TYPE_ENSURE)) {
VALUE *escape_ep = GET_THROWOBJ_CATCH_POINT(errinfo); VALUE errinfo = cfp->ep[-2]; /* #$! */
if (! ENV_IN_HEAP_P(th, escape_ep)) { if (RB_TYPE_P(errinfo, T_NODE)) {
VALUE epval = *escape_ep; VALUE *escape_ep = GET_THROWOBJ_CATCH_POINT(errinfo);
if (!SPECIAL_CONST_P(epval) && RBASIC(epval)->klass == rb_cEnv) { if (! ENV_IN_HEAP_P(th, escape_ep)) {
rb_env_t *epenv; VALUE epval = *escape_ep;
GetEnvPtr(epval, epenv); if (!SPECIAL_CONST_P(epval) && RBASIC(epval)->klass == rb_cEnv) {
SET_THROWOBJ_CATCH_POINT(errinfo, (VALUE)(epenv->env + epenv->local_size)); 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);
} }
} }

1
vm_core.h
View File

@ -782,7 +782,6 @@ VALUE rb_vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc,
int argc, const VALUE *argv, const rb_block_t *blockptr); int argc, const VALUE *argv, const rb_block_t *blockptr);
VALUE rb_vm_make_proc(rb_thread_t *th, const rb_block_t *block, VALUE klass); VALUE rb_vm_make_proc(rb_thread_t *th, const rb_block_t *block, VALUE klass);
VALUE rb_vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp); VALUE rb_vm_make_env_object(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);
void rb_vm_inc_const_missing_count(void); void rb_vm_inc_const_missing_count(void);
void rb_vm_gvl_destroy(rb_vm_t *vm); void rb_vm_gvl_destroy(rb_vm_t *vm);
VALUE rb_vm_call(rb_thread_t *th, VALUE recv, VALUE id, int argc, VALUE rb_vm_call(rb_thread_t *th, VALUE recv, VALUE id, int argc,