2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 421bf209a3..ccc59c916b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 29 09:36:09 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (ruby_cleanup): delay THREAD_KILLED timing.
+	  It should be located just before rb_thread_terminate_all().
+
 Thu Nov 29 09:10:17 2012  Koichi Sasada  <ko1@atdot.net>
 
 	* vm_backtrace.c (vm_backtrace_to_ary): support range argument
diff --git a/eval.c b/eval.c
index 35202ce07b..75549ab359 100644
--- a/eval.c
+++ b/eval.c
@@ -159,9 +159,6 @@ ruby_cleanup(volatile int ex)
     rb_thread_t *th = GET_THREAD();
     int nerr;
 
-    /* protect from thread.raise */
-    th->status = THREAD_KILLED;
-
     rb_threadptr_interrupt(th);
     rb_threadptr_check_signal(th);
     PUSH_TAG();
@@ -180,6 +177,9 @@ ruby_cleanup(volatile int ex)
     }
     POP_TAG();
 
+    /* protect from Thread#raise */
+    th->status = THREAD_KILLED;
+
     errs[0] = th->errinfo;
     PUSH_TAG();
     if ((state = EXEC_TAG()) == 0) {