nobu	2010-02-11 17:52:16 +0900 (Thu, 11 Feb 2010)

  New Revision: 26642

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

  Log:
    * vm.c (vm_exec): reset thread state before restarting vm loop
      from catch scope.  [ruby-core:28129], [ruby-core:28143]

  Modified files:
    trunk/ChangeLog
    trunk/vm.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26641)
+++ ChangeLog	(revision 26642)
@@ -1,3 +1,8 @@
+Thu Feb 11 17:52:11 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm.c (vm_exec): reset thread state before restarting vm loop
+	  from catch scope.  [ruby-core:28129], [ruby-core:28143]
+
 Thu Feb 11 14:43:16 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* marshal.c (r_object0): read sequentially since marshal source
Index: vm.c
===================================================================
--- vm.c	(revision 26641)
+++ vm.c	(revision 26642)
@@ -1303,6 +1303,7 @@
 			  cfp->sp + 1 /* push value */, cfp->lfp, catch_iseq->local_size - 1);
 
 	    state = 0;
+	    th->state = 0;
 	    th->errinfo = Qnil;
 	    goto vm_loop_start;
 	}

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