1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* eval.c (ruby_cleanup): add exception guard around code running

signal handler (of r27513).  Absence of the guard made
  bootstraptest/test_thread.rb fail sometimes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2010-04-27 15:00:41 +00:00
parent e59b9d35fc
commit f93e39261c
2 changed files with 11 additions and 1 deletions

View file

@ -1,3 +1,9 @@
Tue Apr 27 23:57:04 2010 Yusuke Endoh <mame@tsg.ne.jp>
* eval.c (ruby_cleanup): add exception guard around code running
signal handler (of r27513). Absence of the guard made
bootstraptest/test_thread.rb fail sometimes.
Tue Apr 27 22:55:29 2010 Yusuke Endoh <mame@tsg.ne.jp>
* insns.def (onceinlinecache): add exclusion control for a region

6
eval.c
View file

@ -132,7 +132,11 @@ ruby_cleanup(volatile int ex)
rb_threadptr_interrupt(th);
rb_threadptr_check_signal(th);
RUBY_VM_CHECK_INTS();
PUSH_TAG();
if ((state = EXEC_TAG()) == 0) {
SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(); });
}
POP_TAG();
errs[1] = th->errinfo;
th->safe_level = 0;