diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-26 19:59:08 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-26 19:59:08 +0000 |
commit | 6e33c16ffdabf6b8c64a49344f830a25a2b5bccf (patch) | |
tree | 2a72df6eb1bddd05d1130606bb900f98af477adf /cont.c | |
parent | d35bfdac74ceae1c70781667a1efc3378163fe1b (diff) |
Give up support for cross-callcc set_trace_func.
* cont.c (cont_restore_thread): cause error if trace-status is changed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66007 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cont.c')
-rw-r--r-- | cont.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -778,6 +778,10 @@ cont_restore_thread(rb_context_t *cont) ec_switch(th, fib); } + if (th->ec->trace_arg != sec->trace_arg) { + rb_raise(rb_eRuntimeError, "can't call across trace_func"); + } + /* copy vm stack */ #ifdef CAPTURE_JUST_VALID_VM_STACK MEMCPY(th->ec->vm_stack, @@ -799,7 +803,6 @@ cont_restore_thread(rb_context_t *cont) th->ec->root_svar = sec->root_svar; th->ec->ensure_list = sec->ensure_list; th->ec->errinfo = sec->errinfo; - th->ec->trace_arg = sec->trace_arg; VM_ASSERT(th->ec->vm_stack != NULL); } |