kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* vm_eval.c (current_vm_stack_arg): accepts ec.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2017-10-29 15:31:47 +00:00
parent 4d4f23d8c3
commit 484cd5a13e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
vm_eval.c
View file

@ -850,10 +850,10 @@ rb_funcall_with_block(VALUE recv, ID mid, int argc, const VALUE *argv, VALUE pas
} }
static VALUE * static VALUE *
current_vm_stack_arg(rb_thread_t *th, const VALUE *argv) current_vm_stack_arg(const rb_execution_context_t *ec, const VALUE *argv)
{ {
rb_control_frame_t *prev_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->ec->cfp); rb_control_frame_t *prev_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(ec->cfp);
if (RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th->ec, prev_cfp)) return NULL; if (RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(ec, prev_cfp)) return NULL;
if (prev_cfp->sp + 1 != argv) return NULL; if (prev_cfp->sp + 1 != argv) return NULL;
return prev_cfp->sp + 1; return prev_cfp->sp + 1;
} }
@ -889,7 +889,7 @@ send_internal(int argc, const VALUE *argv, VALUE recv, call_type scope)
rb_exc_raise(exc); rb_exc_raise(exc);
} }
if (!SYMBOL_P(*argv)) { if (!SYMBOL_P(*argv)) {
VALUE *tmp_argv = current_vm_stack_arg(rb_ec_thread_ptr(ec), argv); VALUE *tmp_argv = current_vm_stack_arg(ec, argv);
vid = rb_str_intern(vid); vid = rb_str_intern(vid);
if (tmp_argv) { if (tmp_argv) {
tmp_argv[0] = vid; tmp_argv[0] = vid;