From e62a99b924a9b629eca48bfa3f74d1965bc0ecad Mon Sep 17 00:00:00 2001 From: ktsj Date: Fri, 16 Jan 2015 02:54:22 +0000 Subject: * eval_intern.h, vm.c, vm_eval.c, vm_insnhelper.c: change throw mechanism (not save target ep, but save target cfp). It fixes `unexpected break' bug that occurs when TracePoint#binding is called. [ruby-dev:48797] [Bug #10689] * test/ruby/test_settracefunc.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval_intern.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'eval_intern.h') diff --git a/eval_intern.h b/eval_intern.h index c457deb8db..163eeb1a85 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -207,7 +207,7 @@ enum ruby_tag_type { (RNODE((obj))->u3.value = (val)) #define GET_THROWOBJ_VAL(obj) ((VALUE)RNODE((obj))->u1.value) -#define GET_THROWOBJ_CATCH_POINT(obj) ((VALUE*)RNODE((obj))->u2.value) +#define GET_THROWOBJ_CATCH_POINT(obj) ((rb_control_frame_t*)RNODE((obj))->u2.value) #define GET_THROWOBJ_STATE(obj) ((int)RNODE((obj))->u3.value) #define SCOPE_TEST(f) (rb_vm_cref()->nd_visi & (f)) -- cgit v1.2.3