summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-12 14:23:53 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-12 14:23:53 +0000
commit75e7f2ff2d23c8a148558c71c88157635ba3fda3 (patch)
tree8ce41ebfdc3d466db8bf350a7acfbc17acdcf547 /ChangeLog
parente76761e7f269e82d7c51386590319fc13addae9c (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 'ChangeLog')
-rw-r--r--ChangeLog13
1 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 12afcc0f1a..d484a5a253 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Sun Jan 12 22:46:49 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+
+ 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.
+
Sun Jan 12 16:07:52 2014 vo.x (Vit Ondruch) <vondruch@redhat.com>
* tool/rbinstall.rb (Gem::Specification#collect): make stable