summaryrefslogtreecommitdiff
path: root/vm_insnhelper.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-11 12:49:27 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-11 12:49:27 +0000
commitce179b3d04e0875d7cb332f5b57c9df89bb4de07 (patch)
tree697f3a45265e184f5e9affabf530656b52b2b5c9 /vm_insnhelper.c
parentac28b985bdc2f85eada8070d40f6de9f11dab7f8 (diff)
* vm_insnhelper.h: use T_IMEMO to create THROW_DATA.
Add THROW_DATA_NEW(). * internal.h: move defnition of `struct THROW_DATA' from vm_insnhelper.h to internal.h. Rename `THROW_DATA' to `vm_throw_data'. * eval_intern.h (THROW_DATA_P): move to internal.h. THROW_DATA is no longer T_NODE, so check T_IMEMO. * gc.c (gc_mark_children): mark THROW_DATA. * vm.c: catch up these changes. * vm_eval.c: ditto. * vm_insnhelper.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r--vm_insnhelper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 9a30986275..de7d76bd65 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -642,7 +642,7 @@ vm_throw_continue(rb_thread_t *th, VALUE err)
th->state = TAG_THROW;
}
else if (THROW_DATA_P(err)) {
- th->state = THROW_DATA_STATE((struct THROW_DATA *)err);
+ th->state = THROW_DATA_STATE((struct vm_throw_data *)err);
}
else {
th->state = TAG_RAISE;
@@ -781,7 +781,7 @@ vm_throw_start(rb_thread_t * const th, rb_control_frame_t * const reg_cfp, int s
}
th->state = state;
- return (VALUE)NEW_THROW_DATA(throwobj, escape_cfp, state);
+ return (VALUE)THROW_DATA_NEW(throwobj, escape_cfp, state);
}
static VALUE