diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-26 08:41:34 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-26 08:41:34 +0000 |
| commit | 96ff4cd1c5e0709879eab27e3f61b9c4c9260844 (patch) | |
| tree | a834d26f7142d0c06af11d10f9b6bdac08ab8f55 /vm_method.c | |
| parent | fbf899e0204808fa2a01ade8ca8b69feb1bcc479 (diff) | |
| download | ruby-96ff4cd1c5e0709879eab27e3f61b9c4c9260844.tar.gz | |
some functions accept `ec` instead of `th`.
* vm.c (vm_make_env_object): accepts `ec`.
* vm.c (rb_vm_get_ruby_level_next_cfp): ditto.
* vm.c (rb_vm_make_proc): ditto.
* vm.c (rb_vm_make_proc_lambda): ditto.
* vm_core.h: some macros accept ec instead of th
(and make them inline functions):
* RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW
* RUBY_VM_END_CONTROL_FRAME
* RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P
* eval.c (frame_func_id): constify for the first parameter.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_method.c')
| -rw-r--r-- | vm_method.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vm_method.c b/vm_method.c index 9b2dd1fc8a..ac9db90314 100644 --- a/vm_method.c +++ b/vm_method.c @@ -264,7 +264,7 @@ method_definition_set(const rb_method_entry_t *me, rb_method_definition_t *def, def->body.attr.id = (ID)(VALUE)opts; - cfp = rb_vm_get_ruby_level_next_cfp(th, th->ec->cfp); + cfp = rb_vm_get_ruby_level_next_cfp(th->ec, th->ec->cfp); if (cfp && (line = rb_vm_get_sourceline(cfp))) { VALUE location = rb_ary_new3(2, rb_iseq_path(cfp->iseq), INT2FIX(line)); @@ -1088,8 +1088,8 @@ rb_method_boundp(VALUE klass, ID id, int ex) static rb_method_visibility_t rb_scope_visibility_get(void) { - rb_thread_t *th = GET_THREAD(); - rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->ec->cfp); + const rb_execution_context_t *ec = GET_EC(); + const rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(ec, ec->cfp); if (!vm_env_cref_by_cref(cfp->ep)) { return METHOD_VISI_PUBLIC; @@ -1102,8 +1102,8 @@ rb_scope_visibility_get(void) static int rb_scope_module_func_check(void) { - rb_thread_t *th = GET_THREAD(); - rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->ec->cfp); + const rb_execution_context_t *ec = GET_EC(); + const rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(ec, ec->cfp); if (!vm_env_cref_by_cref(cfp->ep)) { return FALSE; |