From a4cbd6412aa8b16893db47ff18243bb4d5371899 Mon Sep 17 00:00:00 2001 From: ko1 Date: Wed, 11 Dec 2013 03:39:52 +0000 Subject: * eval.c (rb_raise_jump): pop frame after setup exception. Patches by deivid (David Rodriguez). [Bug #8886] * test/minitest/test_minitest_unit.rb: catch up this change. * test/ruby/test_backtrace.rb: ditto. * test/ruby/test_settracefunc.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 873d549739..7e64baa938 100644 --- a/eval.c +++ b/eval.c @@ -688,10 +688,10 @@ rb_raise_jump(VALUE mesg) VALUE self = cfp->self; ID mid = cfp->me->called_id; - th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp); - setup_exception(th, TAG_RAISE, mesg); + th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp); + EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, self, mid, klass, Qnil); rb_thread_raised_clear(th); JUMP_TAG(TAG_RAISE); -- cgit v1.2.3