naruse	2012-05-12 00:24:27 +0900 (Sat, 12 May 2012)

  New Revision: 35623

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

  Log:
    Revert r35622.
    
    It breaks bootstraptest/test_exception.rb:388.
    
    "* thread.c (rb_threadptr_execute_interrupts_common): th->errinfo is"

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_signal.rb
    trunk/thread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35622)
+++ ChangeLog	(revision 35623)
@@ -1,11 +1,3 @@
-Fri May 11 22:54:22 2012  NARUSE, Yui  <naruse@r...>
-
-	* thread.c (rb_threadptr_execute_interrupts_common): th->errinfo is
-	  not Fixnum, but exception object.
-	  This causes test_signal_requiring of test/ruby/test_signal.rb fail
-	  if the sub process is killed on waiting IO in lex_io_gets in require
-	  itself, not sleep.
-
 Fri May 11 14:23:11 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (primary): begin/end block should be isolated from outside.
Index: thread.c
===================================================================
--- thread.c	(revision 35622)
+++ thread.c	(revision 35623)
@@ -1300,7 +1300,7 @@
 	    thread_debug("rb_thread_execute_interrupts: %"PRIdVALUE"\n", err);
 
 	    if (err == eKillSignal || err == eTerminateSignal) {
-		th->errinfo = rb_exc_new2(rb_eInterrupt, "");
+		th->errinfo = INT2FIX(TAG_FATAL);
 		TH_JUMP_TAG(th, TAG_FATAL);
 	    }
 	    else {
Index: test/ruby/test_signal.rb
===================================================================
--- test/ruby/test_signal.rb	(revision 35622)
+++ test/ruby/test_signal.rb	(revision 35623)
@@ -212,7 +212,7 @@
     STDOUT.flush
   end
 end
-Thread.pass until th.stop? # this may stop inside lex_io_gets
+Thread.pass while th.running?
 Process.kill(:INT, $$)
 th.join
 EOS

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