1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* eval.c (ruby_finalize_1): rb_thread_t#errinfo should be clear with

Browse Source 
Qnil.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-06-15 03:22:51 +00:00
parent 31ac946975
commit 70df6311af
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jun 15 12:22:10 2007 Koichi Sasada <ko1@atdot.net>
* eval.c (ruby_finalize_1): rb_thread_t#errinfo should be clear with
Qnil.
Fri Jun 15 12:20:11 2007 Koichi Sasada <ko1@atdot.net> Fri Jun 15 12:20:11 2007 Koichi Sasada <ko1@atdot.net>
* cont.c (rb_cont_call): forbid cross fiber continuation call. * cont.c (rb_cont_call): forbid cross fiber continuation call.

5
eval.c
View File

@ -137,7 +137,7 @@ static void
ruby_finalize_1(void) ruby_finalize_1(void)
{ {
signal(SIGINT, SIG_DFL); signal(SIGINT, SIG_DFL);
GET_THREAD()->errinfo = 0; GET_THREAD()->errinfo = Qnil;
rb_clear_trace_func(); rb_clear_trace_func();
rb_gc_call_finalizer_at_exit(); rb_gc_call_finalizer_at_exit();
} }
@ -668,6 +668,7 @@ rb_longjmp(int tag, VALUE mesg)
th->errinfo = exception_error; th->errinfo = exception_error;
JUMP_TAG(TAG_FATAL); JUMP_TAG(TAG_FATAL);
} }
if (NIL_P(mesg)) if (NIL_P(mesg))
mesg = GET_THREAD()->errinfo; mesg = GET_THREAD()->errinfo;
if (NIL_P(mesg)) { if (NIL_P(mesg)) {
@ -709,10 +710,12 @@ rb_longjmp(int tag, VALUE mesg)
} }
rb_trap_restore_mask(); rb_trap_restore_mask();
if (tag != TAG_FATAL) { if (tag != TAG_FATAL) {
EXEC_EVENT_HOOK(th, RUBY_EVENT_RAISE, th->cfp->self, EXEC_EVENT_HOOK(th, RUBY_EVENT_RAISE, th->cfp->self,
0 /* TODO: id */, 0 /* TODO: klass */); 0 /* TODO: id */, 0 /* TODO: klass */);
} }
thread_reset_raised(th); thread_reset_raised(th);
JUMP_TAG(tag); JUMP_TAG(tag);
} }