From a74fe7546d0583d0b8e0f0dbc6ee19758888ad4a Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 10 Mar 2015 20:07:47 +0000 Subject: [PATCH] * vm_eval.c (rb_catch_protect): use THROW_DATA_VAL(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ vm_eval.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a5ad3a02c2..79b47c3dbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Mar 11 05:06:46 2015 Koichi Sasada + + * vm_eval.c (rb_catch_protect): use THROW_DATA_VAL(). + Wed Mar 11 04:56:04 2015 Koichi Sasada * vm_insnhelper.h: define struct IFUNC. diff --git a/vm_eval.c b/vm_eval.c index 30849ccff6..0524019e16 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -1995,7 +1995,7 @@ rb_catch_protect(VALUE t, rb_block_call_func *func, VALUE data, int *stateptr) /* call with argc=1, argv = [tag], block = Qnil to insure compatibility */ val = (*func)(tag, data, 1, (const VALUE *)&tag, Qnil); } - else if (state == TAG_THROW && RNODE(th->errinfo)->u1.value == tag) { + else if (state == TAG_THROW && THROW_DATA_VAL((struct THROW_DATA *)th->errinfo) == tag) { rb_vm_rewind_cfp(th, saved_cfp); val = th->tag->retval; th->errinfo = Qnil;