From 0e6f7a503c32fdac8da1240974e0ab2d92fc5415 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 25 Dec 2008 09:56:46 +0000 Subject: 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 --- ChangeLog | 4 ++++ vm_insnhelper.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index da8f6ef16..15e76dc05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Dec 25 12:44:27 2008 Koichi Sasada + + * vm_insnhelper.c (vm_yield_with_cfunc): check block has Proc. + Thu Dec 25 05:53:01 2008 Nobuyoshi Nakada * 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; -- cgit