From 6ece90852b3b12a8873d85b35104a93867dbfc14 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 3 Jul 2014 06:20:05 +0000 Subject: merge revision(s) 44535,44536: [Backport #9321] * vm.c (rb_vm_pop_cfunc_frame): added. It cares c_return event. The patch base by drkaes (Stefan Kaes). [Bug #9321] * variable.c (rb_mod_const_missing): use rb_vm_pop_cfunc_frame() instead of rb_frame_pop(). * vm_eval.c (raise_method_missing): ditto. * vm_eval.c (rb_iterate): ditto. * internal.h (rb_vm_pop_cfunc_frame): add decl. * test/ruby/test_settracefunc.rb: add tests. provided by drkaes (Stefan Kaes). * vm.c, eval.c, include/ruby/intern.h (rb_frame_pop): move definition of rb_frame_pop() and deprecate it. It doesn't care about `return' events. * vm.c, eval.c, include/ruby/intern.h (rb_frame_pop): git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@46671 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/intern.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/ruby') diff --git a/include/ruby/intern.h b/include/ruby/intern.h index b1dff0b7b9..838beb9e68 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -911,11 +911,14 @@ VALUE rb_mod_remove_cvar(VALUE, VALUE); ID rb_frame_callee(void); VALUE rb_str_succ(VALUE); VALUE rb_time_succ(VALUE); -void rb_frame_pop(void); int rb_frame_method_id_and_class(ID *idp, VALUE *klassp); VALUE rb_make_backtrace(void); VALUE rb_make_exception(int, VALUE*); +/* deprecated */ +DEPRECATED(void rb_frame_pop(void)); + + #if defined __GNUC__ && __GNUC__ >= 4 #pragma GCC visibility pop #endif -- cgit v1.2.3