diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-10 21:28:09 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-10 21:28:09 +0000 |
| commit | 9f21759c53934597aa2db6a68fffc2edd662b3ed (patch) | |
| tree | 0d3055689bdcfdb145aa1209be9e17412f1c34ef | |
| parent | a74fe7546d0583d0b8e0f0dbc6ee19758888ad4a (diff) | |
* vm_insnhelper.h (THROW_DATA_STATE): return int, not VALUE.
* vm_insnhelper.h (THROW_DATA_STATE_SET): accept int value.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | vm_insnhelper.h | 8 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Wed Mar 11 06:26:21 2015 Koichi Sasada <ko1@atdot.net> + + * vm_insnhelper.h (THROW_DATA_STATE): return int, not VALUE. + + * vm_insnhelper.h (THROW_DATA_STATE_SET): accept int value. + Wed Mar 11 05:06:46 2015 Koichi Sasada <ko1@atdot.net> * vm_eval.c (rb_catch_protect): use THROW_DATA_VAL(). diff --git a/vm_insnhelper.h b/vm_insnhelper.h index ccf0c46db8..b94b777606 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -260,9 +260,9 @@ THROW_DATA_CATCH_FRAME_SET(struct THROW_DATA *obj, const rb_control_frame_t *cfp } static inline void -THROW_DATA_STATE_SET(struct THROW_DATA *obj, VALUE st) +THROW_DATA_STATE_SET(struct THROW_DATA *obj, int st) { - obj->throw_state = st; + obj->throw_state = (VALUE)st; } static inline VALUE @@ -277,10 +277,10 @@ THROW_DATA_CATCH_FRAME(const struct THROW_DATA *obj) return obj->catch_frame; } -static VALUE +static int THROW_DATA_STATE(const struct THROW_DATA *obj) { - return obj->throw_state; + return (int)obj->throw_state; } struct IFUNC { |