diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 03:49:09 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 03:49:09 +0000 |
commit | f6e435fe878cfdb03906b1dbb2e366e9b3408b53 (patch) | |
tree | e62cececf121e94b99a4e3b32021c7970ea1902d | |
parent | b8db90f35abed0077458a9a6fba257664f474957 (diff) | |
download | ruby-f6e435fe878cfdb03906b1dbb2e366e9b3408b53.tar.gz |
* vm_insnhelper.c (vm_yield_with_cfunc): check block has Proc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | vm_insnhelper.c | 7 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Thu Dec 25 12:44:27 2008 Koichi Sasada <ko1@atdot.net> + + * vm_insnhelper.c (vm_yield_with_cfunc): check block has Proc. + Thu Dec 25 05:53:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * template/id.h.tmpl, id.h (ruby_method_ids): not depend on if diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 46c11a6de0..13bd03dc66 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -661,7 +661,12 @@ vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block, } if (blockptr) { - blockarg = vm_make_proc(th, blockptr, rb_cProc); + if (blockptr->proc) { + blockarg = blockptr->proc; + } + else { + blockarg = vm_make_proc(th, blockptr, rb_cProc); + } } else { blockarg = Qnil; |