From e4021207fb0add1133b0c3e7f3b2acc2bc8d877c Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 19 Feb 2008 11:49:51 +0000 Subject: [PATCH] * eval.c (rb_raise_jump): moved adjustment for control frame. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ eval.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d96c5f5fd..eec5f1106d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Feb 19 20:49:49 2008 Nobuyoshi Nakada + + * eval.c (rb_raise_jump): moved adjustment for control frame. + Tue Feb 19 18:34:32 2008 Tanaka Akira * gc.c (STACK_LENGTH) [SPARC] : 0x80 offset removed. [ruby-dev:33857] diff --git a/eval.c b/eval.c index e7d9c1f45e..db760116df 100644 --- a/eval.c +++ b/eval.c @@ -775,9 +775,7 @@ rb_f_raise(int argc, VALUE *argv) argv = &err; } } - err = rb_make_exception(argc, argv); - GET_THREAD()->cfp++; - rb_raise_jump(err); + rb_raise_jump(rb_make_exception(argc, argv)); return Qnil; /* not reached */ } @@ -830,6 +828,8 @@ rb_make_exception(int argc, VALUE *argv) void rb_raise_jump(VALUE mesg) { + rb_thread_t *th = GET_THREAD(); + th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp); /* TODO: fix me */ rb_longjmp(TAG_RAISE, mesg); }