2 files changed, 5 insertions, 1 deletions
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  <ko1@atdot.net>
+
+	* vm_eval.c (rb_catch_protect): use THROW_DATA_VAL().
+
 Wed Mar 11 04:56:04 2015  Koichi Sasada  <ko1@atdot.net>
 
 	* 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;