From 398ed65c909aad37b043c703b9a05de1d9c405bf Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 11 Jan 2013 08:02:06 +0000 Subject: [Backport #7624] * vm_trace.c (rb_threadptr_exec_event_hooks): added a parameter to 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()' with the pop flag. * 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. * bootstraptest/test_flow.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index f7f3e0cae7..7f0755df3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +Fri Jan 11 16:57:31 2013 NAKAMURA Usaku + + * vm_trace.c (rb_threadptr_exec_event_hooks): added a parameter to 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()' with the pop flag. + + * 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. + + * bootstraptest/test_flow.rb: add a test. + Mon Jan 7 15:50:25 2013 Nobuyoshi Nakada * vm.c (rb_vm_make_proc): save the proc made from the given block so -- cgit v1.2.3