summaryrefslogtreecommitdiff
path: root/cont.c
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-25 13:22:16 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-25 13:22:16 +0000
commit24f5161c39d225e4bbe5d05362a582c01a366a9a (patch)
treee1a9e7547e5671df1456ceca9c2a901898447faf /cont.c
parent1d415019bd993eda34c205c3628945f9d3e6865a (diff)
* cont.c (rb_cont_call, cont_restore_1): remove trap_tag check because
it seems not to make sense. [ruby-dev:40121] * vm_core.h, eval.c (rb_protect): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cont.c')
-rw-r--r--cont.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/cont.c b/cont.c
index a77f35e6d2..932b10e2dc 100644
--- a/cont.c
+++ b/cont.c
@@ -388,7 +388,6 @@ cont_restore_1(rb_context_t *cont)
th->state = sth->state;
th->status = sth->status;
th->tag = sth->tag;
- th->trap_tag = sth->trap_tag;
th->errinfo = sth->errinfo;
th->first_proc = sth->first_proc;
@@ -621,9 +620,6 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
if (cont->saved_thread.self != th->self) {
rb_raise(rb_eRuntimeError, "continuation called across threads");
}
- if (cont->saved_thread.trap_tag != th->trap_tag) {
- rb_raise(rb_eRuntimeError, "continuation called across trap");
- }
if (cont->saved_thread.fiber) {
rb_fiber_t *fcont;
GetFiberPtr(cont->saved_thread.fiber, fcont);
@@ -940,9 +936,6 @@ fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume)
if (cont->saved_thread.self != th->self) {
rb_raise(rb_eFiberError, "fiber called across threads");
}
- else if (cont->saved_thread.trap_tag != th->trap_tag) {
- rb_raise(rb_eFiberError, "fiber called across trap");
- }
else if (fib->status == TERMINATED) {
value = rb_exc_new2(rb_eFiberError, "dead fiber called");
if (th->fiber != fibval) rb_exc_raise(value);