diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | version.h | 10 | ||||
-rw-r--r-- | vm.c | 11 |
3 files changed, 20 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Mon Jan 7 15:50:25 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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] + Tue Dec 25 23:35:09 2012 NARUSE, Yui <naruse@ruby-lang.org> * lib/mkmf.rb: fix for if config["libdir"] is nil. @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 362 +#define RUBY_PATCHLEVEL 363 -#define RUBY_RELEASE_DATE "2012-12-25" -#define RUBY_RELEASE_YEAR 2012 -#define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DATE "2013-01-07" +#define RUBY_RELEASE_YEAR 2013 +#define RUBY_RELEASE_MONTH 1 +#define RUBY_RELEASE_DAY 7 #include "ruby/version.h" @@ -468,10 +468,18 @@ vm_collect_local_variables_in_heap(rb_thread_t *th, VALUE *dfp, VALUE ary) } 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 *lfp; rb_block_t *blockptr; @@ -489,6 +497,7 @@ rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp) rb_proc_t *p; GetProcPtr(blockprocval, p); lfp[0] = GC_GUARDED_PTR(&p->block); + *blockprocptr = blockprocval; } envval = vm_make_env_each(th, cfp, cfp->dfp, cfp->lfp); @@ -559,7 +568,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); |