aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-23 04:52:20 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-23 04:52:20 +0000
commita4f79a6ece4b02720507b0ff249c2964ee859479 (patch)
tree4d7ee4eb683d9f88c9a7c490cad5f66bea96d801
parentd41ec2a79a53bc17dc9c7d574ae3824f5276745d (diff)
downloadruby-a4f79a6ece4b02720507b0ff249c2964ee859479.tar.gz
Revert the last commit because some tests (in btest) fail
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37295 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--thread.c4
2 files changed, 0 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 3da56561f5..8fc021deff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,3 @@
-Tue Oct 23 13:27:51 2012 Koichi Sasada <ko1@atdot.net>
-
- * 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 <ko1@atdot.net>
* vm_core.h, vm_insnhelper.c, vm_eval.c (OPT_CALL_CFUNC_WITHOUT_FRAME):
diff --git a/thread.c b/thread.c
index fdf1003ae2..4b750b4dcc 100644
--- a/thread.c
+++ b/thread.c
@@ -1790,10 +1790,6 @@ 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;
}