diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-11 08:51:25 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-11 08:51:25 +0000 |
commit | 190156054e33bc3b3bdd9e7965a1fe4a8cd50ebf (patch) | |
tree | 32141f69a654ed835642b64bf19e3ff8b6e73bd0 | |
parent | 1ab4abf8c35148d8bceb6f24bdc41ebae0f94d58 (diff) |
[Backport #5634]
* vm.c (rb_vm_make_env_object): make Proc object if Env is possible
to point block. [ruby-core:41038] [ruby-trunk - Bug #5634]
* vm.c (rb_vm_make_proc): No need to make Proc object here.
* bootstraptest/test_proc.rb: add tests.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | bootstraptest/test_proc.rb | 24 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | vm.c | 24 |
4 files changed, 48 insertions, 11 deletions
@@ -1,3 +1,12 @@ +Tue Dec 11 17:49:45 2012 Koichi Sasada <ko1@atdot.net> + + * vm.c (rb_vm_make_env_object): make Proc object if Env is possible + to point block. [ruby-core:41038] [ruby-trunk - Bug #5634] + + * vm.c (rb_vm_make_proc): No need to make Proc object here. + + * bootstraptest/test_proc.rb: add tests. + Tue Dec 11 17:47:01 2012 Narihiro Nakamura <authornari@gmail.com> * lib/irb/magic-file.rb: set a encoding, which is detected from diff --git a/bootstraptest/test_proc.rb b/bootstraptest/test_proc.rb index 3d347004ea..dfe89033d8 100644 --- a/bootstraptest/test_proc.rb +++ b/bootstraptest/test_proc.rb @@ -456,3 +456,27 @@ assert_equal 'ok', %q{ end } +assert_equal 'ok', %q{ + def x + binding + end + b = x{|a| a } + b.eval('yield("ok")') +}, '[Bug #5634]' + +assert_equal 'ok', %q{ + def x + binding + end + eval("x { 'ok' }").eval "yield" +}, '[Bug #5634]' + +assert_equal 'ok', %q{ + def x + binding + end + def m + x{ 'ok' } + end + eval('yield', m) +}, '[Bug #5634]' @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 333 +#define RUBY_PATCHLEVEL 334 #define RUBY_RELEASE_DATE "2012-12-11" #define RUBY_RELEASE_YEAR 2012 @@ -467,16 +467,30 @@ 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); + VALUE rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp) { VALUE envval; + VALUE *lfp; + rb_block_t *blockptr; if (VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_FINISH) { /* for method_missing */ cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); } + lfp = cfp->lfp; + blockptr = GC_GUARDED_PTR_REF(lfp[0]); + + if (blockptr && !(lfp[0] & 0x02)) { + VALUE blockprocval = vm_make_proc_from_block(th, blockptr); + rb_proc_t *p; + GetProcPtr(blockprocval, p); + lfp[0] = GC_GUARDED_PTR(&p->block); + } + envval = vm_make_env_each(th, cfp, cfp->dfp, cfp->lfp); rb_vm_rewrite_dfp_in_errinfo(th); @@ -545,16 +559,6 @@ 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."); } - if (GC_GUARDED_PTR_REF(cfp->lfp[0])) { - rb_proc_t *p; - - blockprocval = vm_make_proc_from_block( - th, (rb_block_t *)GC_GUARDED_PTR_REF(*cfp->lfp)); - - GetProcPtr(blockprocval, p); - *cfp->lfp = GC_GUARDED_PTR(&p->block); - } - envval = rb_vm_make_env_object(th, cfp); if (PROCDEBUG) { |