diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-12 14:23:53 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-12 14:23:53 +0000 |
| commit | 75e7f2ff2d23c8a148558c71c88157635ba3fda3 (patch) | |
| tree | 8ce41ebfdc3d466db8bf350a7acfbc17acdcf547 /vm_trace.c | |
| parent | e76761e7f269e82d7c51386590319fc13addae9c (diff) | |
merge revision(s) 44260: [Backport #9168]
patch inspired from r44260 on trunk. [ruby-core:58652] [Bug #9168]
* gc.c (run_finalizer): clear th->errinfo before invoke finalizer and
restore afterward.
* test/ruby/test_gc.rb (test_exception_in_finalizer): add test for
above.
* vm_trace.c (rb_threadptr_exec_event_hooks_orig): clear th->errinfo
before invoke hook.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_trace.c')
| -rw-r--r-- | vm_trace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vm_trace.c b/vm_trace.c index 0d6e43c786..2b21426e27 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -290,6 +290,7 @@ rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p) const int outer_state = th->state; int state = 0; th->state = 0; + th->errinfo = Qnil; th->vm->trace_running++; th->trace_arg = trace_arg; |