summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authortarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-05 09:54:58 +0000
committertarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-05 09:54:58 +0000
commit17a11774ca9bc79609128187e3b6c814bd590ce5 (patch)
tree3a5f149e17583cdd935defe5d1d0f9bbfbfd360c /thread.c
parent592e87e1f8cbe257f8f11d703c1315b033537b6c (diff)
* thread.c (rb_thread_s_async_interrupt_timing): have to check ints before jumpping out.
* test/ruby/test_thread.rb (test_async_interrupt_with_return): add test rescue has to catch a queued async exception at the time of return. * test/ruby/test_thread.rb (test_async_interrupt_with_break): add test rescue has to catch a queued async exception at the time of break. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/thread.c b/thread.c
index 82ca1170fb..8fd4580ab2 100644
--- a/thread.c
+++ b/thread.c
@@ -1686,12 +1686,12 @@ rb_thread_s_async_interrupt_timing(VALUE self, VALUE mask_arg)
RUBY_VM_SET_INTERRUPT(th);
}
+ RUBY_VM_CHECK_INTS(th);
+
if (state) {
JUMP_TAG(state);
}
- RUBY_VM_CHECK_INTS(th);
-
return r;
}