diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-25 13:24:17 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-25 13:24:17 +0000 |
commit | c2693f8bd61757e32d2f92010c041a79b21d074a (patch) | |
tree | 0d41dfc32ff961b7b1a6cf0d139779069de280c9 /ChangeLog | |
parent | 0f63b60f23aea76e52a6f6fc0d073eb2defe58d8 (diff) | |
download | ruby-c2693f8bd61757e32d2f92010c041a79b21d074a.tar.gz |
* 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
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 17 |
1 files changed, 17 insertions, 0 deletions
@@ -1,3 +1,20 @@ +Tue Dec 25 22:06:33 2012 Koichi Sasada <ko1@atdot.net> + + * 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 <keiju@ishitsuka.com> * lib/irb/init.rb, lib/irb/lc/ja/error.rb, lib/irb/lc/error.rb: |