From d41ec2a79a53bc17dc9c7d574ae3824f5276745d Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 23 Oct 2012 04:33:04 +0000 Subject: * thread.c (rb_threadptr_raise): check interrupts after Thread#raise because the behavior of Thread.current.raise is expected to perform same as Kernel.raise (by rubyspec). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ thread.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8fc021deff..3da56561f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Oct 23 13:27:51 2012 Koichi Sasada + + * thread.c (rb_threadptr_raise): check interrupts after + Thread#raise because the behavior of Thread.current.raise is + expected to perform same as Kernel.raise (by rubyspec). + Tue Oct 23 12:57:29 2012 Koichi Sasada * vm_core.h, vm_insnhelper.c, vm_eval.c (OPT_CALL_CFUNC_WITHOUT_FRAME): diff --git a/thread.c b/thread.c index 4b750b4dcc..fdf1003ae2 100644 --- a/thread.c +++ b/thread.c @@ -1790,6 +1790,10 @@ rb_threadptr_raise(rb_thread_t *th, int argc, VALUE *argv) } rb_threadptr_async_errinfo_enque(th, exc); rb_threadptr_interrupt(th); + + /* To perform Thread.current.raise as Kernel.raise */ + RUBY_VM_CHECK_INTS(th); + return Qnil; } -- cgit v1.2.3