From c2693f8bd61757e32d2f92010c041a79b21d074a Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 25 Dec 2012 13:24:17 +0000 Subject: * vm_trace.c (rb_threadptr_exec_event_hooks_and_pop_frame): pop a frame before JUMP_TAG() if exception occurred. This change fix bug of Ruby 1.9. [ruby-core:51128] [ruby-trunk - Bug #7624] * vm_core.h (EXEC_EVENT_HOOK_AND_POP_FRAME): add to use `rb_threadptr_exec_event_hooks_and_pop_frame()'. * vm.c (vm_exec): use EXEC_EVENT_HOOK_AND_POP_FRAME() while exception handling. While exception hadnling, if an exception is raised in hooks, need to pop current frame and raise this raised exception by hook. * test/ruby/test_settracefunc.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38601 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 9f307aa015..ae07f5b4fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +Tue Dec 25 22:06:33 2012 Koichi Sasada + + * vm_trace.c (rb_threadptr_exec_event_hooks_and_pop_frame): + pop a frame before JUMP_TAG() if exception occurred. + This change fix bug of Ruby 1.9. + [ruby-core:51128] [ruby-trunk - Bug #7624] + + * vm_core.h (EXEC_EVENT_HOOK_AND_POP_FRAME): add to use + `rb_threadptr_exec_event_hooks_and_pop_frame()'. + + * vm.c (vm_exec): use EXEC_EVENT_HOOK_AND_POP_FRAME() while + exception handling. While exception hadnling, if an exception + is raised in hooks, need to pop current frame and raise this + raised exception by hook. + + * test/ruby/test_settracefunc.rb: add a test. + Tue Dec 25 21:08:53 2012 Keiju Ishitsuka * lib/irb/init.rb, lib/irb/lc/ja/error.rb, lib/irb/lc/error.rb: -- cgit v1.2.3