From 6140b395585d53ef2f02e81ef08ad58ac5e79e88 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 14 Nov 2016 18:37:39 +0000 Subject: merge revision(s) 56766,56767: [Backport #12925] error.c: rb_get_backtrace * error.c (rb_get_backtrace): move from eval_error.c to call exc_backtrace directly. [ruby-core:78097] [Bug #12925] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@56786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- error.c | 20 +++++++++++++++++++ eval.c | 27 +++++++++++++++++++------- eval_error.c | 21 ++------------------ test/ruby/test_exception.rb | 47 +++++++++++++++++++++++++++++++++++++++++++++ version.h | 6 +++--- 5 files changed, 92 insertions(+), 29 deletions(-) diff --git a/error.c b/error.c index b92d886832..6b13c234b9 100644 --- a/error.c +++ b/error.c @@ -819,6 +819,26 @@ exc_backtrace(VALUE exc) return obj; } +VALUE +rb_get_backtrace(VALUE exc) +{ + ID mid; + CONST_ID(mid, "backtrace"); + if (rb_method_basic_definition_p(CLASS_OF(exc), mid)) { + VALUE info, klass = rb_eException; + rb_thread_t *th = GET_THREAD(); + if (NIL_P(exc)) + return Qnil; + EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, exc, mid, klass, Qundef); + info = exc_backtrace(exc); + EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, exc, mid, klass, info); + if (NIL_P(info)) + return Qnil; + return rb_check_backtrace(info); + } + return rb_funcall(exc, mid, 0, 0); +} + /* * call-seq: * exception.backtrace_locations -> array diff --git a/eval.c b/eval.c index 65c604c3b2..9fb819ae84 100644 --- a/eval.c +++ b/eval.c @@ -519,13 +519,25 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause) rb_ivar_set(mesg, idBt_locations, at); } } - else if (NIL_P(get_backtrace(mesg))) { - at = rb_vm_backtrace_object(); - if (OBJ_FROZEN(mesg)) { - mesg = rb_obj_dup(mesg); + else { + int status; + + TH_PUSH_TAG(th); + if ((status = EXEC_TAG()) == 0) { + VALUE bt; + if (rb_threadptr_set_raised(th)) goto fatal; + bt = rb_get_backtrace(mesg); + if (NIL_P(bt)) { + at = rb_vm_backtrace_object(); + if (OBJ_FROZEN(mesg)) { + mesg = rb_obj_dup(mesg); + } + rb_ivar_set(mesg, idBt_locations, at); + set_backtrace(mesg, at); + } + rb_threadptr_reset_raised(th); } - rb_ivar_set(mesg, idBt_locations, at); - set_backtrace(mesg, at); + TH_POP_TAG(); } } @@ -567,6 +579,7 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause) } if (rb_threadptr_set_raised(th)) { + fatal: th->errinfo = exception_error; rb_threadptr_reset_raised(th); JUMP_TAG(TAG_FATAL); @@ -1587,7 +1600,7 @@ errat_getter(ID id) { VALUE err = get_errinfo(); if (!NIL_P(err)) { - return get_backtrace(err); + return rb_get_backtrace(err); } else { return Qnil; diff --git a/eval_error.c b/eval_error.c index 405d738236..241c90c36f 100644 --- a/eval_error.c +++ b/eval_error.c @@ -40,23 +40,6 @@ error_pos(void) } } -static VALUE -get_backtrace(VALUE info) -{ - if (NIL_P(info)) - return Qnil; - info = rb_funcall(info, rb_intern("backtrace"), 0); - if (NIL_P(info)) - return Qnil; - return rb_check_backtrace(info); -} - -VALUE -rb_get_backtrace(VALUE info) -{ - return get_backtrace(info); -} - VALUE rb_exc_set_backtrace(VALUE exc, VALUE bt); static void @@ -73,7 +56,7 @@ set_backtrace(VALUE info, VALUE bt) bt = rb_backtrace_to_str_ary(bt); } } - rb_funcall(info, rb_intern("set_backtrace"), 1, bt); + rb_check_funcall(info, set_backtrace, 1, &bt); } static void @@ -93,7 +76,7 @@ error_print(void) TH_PUSH_TAG(th); if (TH_EXEC_TAG() == 0) { - errat = get_backtrace(errinfo); + errat = rb_get_backtrace(errinfo); } else if (errat == Qundef) { errat = Qnil; diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index c49de80113..3268096463 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -769,4 +769,51 @@ $stderr = $stdout; raise "\x82\xa0"') do |outs, errs, status| assert_raise(NameError) {a.instance_eval("foo")} assert_raise(NoMethodError, bug10969) {a.public_send("bar", true)} end + + def test_undefined_backtrace + assert_separately([], "#{<<-"begin;"}\n#{<<-"end;"}") + begin; + class Exception + undef backtrace + end + + assert_raise(RuntimeError) { + raise RuntimeError, "hello" + } + end; + end + + def test_redefined_backtrace + assert_separately([], "#{<<-"begin;"}\n#{<<-"end;"}") + begin; + $exc = nil + + class Exception + undef backtrace + def backtrace + $exc = self + end + end + + e = assert_raise(RuntimeError) { + raise RuntimeError, "hello" + } + assert_same(e, $exc) + end; + end + + def test_wrong_backtrace + assert_separately([], "#{<<-"begin;"}\n#{<<-"end;"}") + begin; + class Exception + undef backtrace + def backtrace(a) + end + end + + assert_raise(RuntimeError) { + raise RuntimeError, "hello" + } + end; + end end diff --git a/version.h b/version.h index d51c52a306..bba9215b9b 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.6" -#define RUBY_RELEASE_DATE "2016-11-12" -#define RUBY_PATCHLEVEL 391 +#define RUBY_RELEASE_DATE "2016-11-15" +#define RUBY_PATCHLEVEL 392 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 15 #include "ruby/version.h" -- cgit v1.2.3