From 31e6f72c8ea0990ca7acdfc7b99b89abd4566f0b Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 5 Dec 2012 13:46:11 +0000 Subject: vm.c: save blockprocval * vm.c (rb_vm_make_proc): save the proc made from the given block so that it will not get collected. [ruby-core:50545] [Bug #7507] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'vm.c') diff --git a/vm.c b/vm.c index d39fe02e0c..b59044d5e4 100644 --- a/vm.c +++ b/vm.c @@ -477,9 +477,17 @@ 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); static VALUE vm_make_proc_from_block(rb_thread_t *th, rb_block_t *block); +static VALUE vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp, VALUE *blockprocptr); VALUE rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp) +{ + VALUE blockprocval; + return vm_make_env_object(th, cfp, &blockprocval); +} + +static VALUE +vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp, VALUE *blockprocptr) { VALUE envval; VALUE *lep = VM_CF_LEP(cfp); @@ -490,6 +498,7 @@ rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp) rb_proc_t *p; GetProcPtr(blockprocval, p); lep[0] = VM_ENVVAL_BLOCK_PTR(&p->block); + *blockprocptr = blockprocval; } envval = vm_make_env_each(th, cfp, cfp->ep, lep); @@ -560,7 +569,7 @@ rb_vm_make_proc(rb_thread_t *th, const rb_block_t *block, VALUE klass) rb_bug("rb_vm_make_proc: Proc value is already created."); } - envval = rb_vm_make_env_object(th, cfp); + envval = vm_make_env_object(th, cfp, &blockprocval); if (PROCDEBUG) { check_env_value(envval); -- cgit v1.2.3