diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:56:46 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:56:46 +0000 |
| commit | 0e6f7a503c32fdac8da1240974e0ab2d92fc5415 (patch) | |
| tree | ad06768e1415990eb95c424cc21ffa8eb4fdda5d | |
| parent | c46480b286391ca4dd22b6c9d5cbc95c6c2de646 (diff) | |
merges r20979 from trunk into ruby_1_9_1.
* vm_insnhelper.c (vm_yield_with_cfunc): check block has Proc.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21032 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 1dfb07e06..1a8d3df6e 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; |