yugui	2008-12-25 18:56:46 +0900 (Thu, 25 Dec 2008)

  New Revision: 21032

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21032

  Log:
    merges r20979 from trunk into ruby_1_9_1.
    * vm_insnhelper.c (vm_yield_with_cfunc): check block has Proc.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/vm_insnhelper.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21031)
+++ ruby_1_9_1/ChangeLog	(revision 21032)
@@ -1,3 +1,7 @@
+Thu Dec 25 12:44:27 2008  Koichi Sasada  <ko1@a...>
+
+	* vm_insnhelper.c (vm_yield_with_cfunc): check block has Proc.
+
 Thu Dec 25 05:53:01 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* template/id.h.tmpl, id.h (ruby_method_ids): not depend on if
Index: ruby_1_9_1/vm_insnhelper.c
===================================================================
--- ruby_1_9_1/vm_insnhelper.c	(revision 21031)
+++ ruby_1_9_1/vm_insnhelper.c	(revision 21032)
@@ -661,7 +661,12 @@
     }
 
     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;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/