summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-23 08:24:54 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-23 08:24:54 +0000
commita90c696b8bb67eecc5b415d58f55705c0bf3f8f8 (patch)
treec20f7d0544a5754228eafb28f984c736fea49df4 /thread.c
parent769ef81ae36325ee0fcb4c27c507e69a00c5e1ea (diff)
rb_catch_protect() accepts enum ruby_tag_type *.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/thread.c b/thread.c
index 5e0cac5fa8..edae43e50c 100644
--- a/thread.c
+++ b/thread.c
@@ -4689,22 +4689,22 @@ exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pairid, VALUE
return (*func)(obj, arg, TRUE);
}
else {
+ enum ruby_tag_type state;
+
p.func = func;
if (outermost) {
- int state;
recursive_push(p.list, ID2SYM(recursive_key), 0);
recursive_push(p.list, p.objid, p.pairid);
result = rb_catch_protect(p.list, exec_recursive_i, (VALUE)&p, &state);
if (!recursive_pop(p.list, p.objid, p.pairid)) goto invalid;
if (!recursive_pop(p.list, ID2SYM(recursive_key), 0)) goto invalid;
- if (state) JUMP_TAG(state);
+ if (state != TAG_NONE) JUMP_TAG(state);
if (result == p.list) {
result = (*func)(obj, arg, TRUE);
}
}
else {
- enum ruby_tag_type state;
volatile VALUE ret = Qundef;
recursive_push(p.list, p.objid, p.pairid);
PUSH_TAG();
@@ -4718,7 +4718,7 @@ exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pairid, VALUE
"for %+"PRIsVALUE" in %+"PRIsVALUE,
sym, rb_thread_current());
}
- if (state) JUMP_TAG(state);
+ if (state != TAG_NONE) JUMP_TAG(state);
result = ret;
}
}