1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vm_eval.c: no use of SYM2ID

Browse Source 
* vm_eval.c (check_funcall_missing): no longer turn an ID into a
  symbol temporarily to get rid of use of SYM2ID.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49518 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-02-06 02:33:38 +00:00
parent b4f61ad610
commit 536ef60a68
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

@ -350,7 +350,7 @@ rb_call0(VALUE recv, ID mid, int argc, const VALUE *argv,
struct rescue_funcall_args { struct rescue_funcall_args {
VALUE recv; VALUE recv;
VALUE sym; ID mid;
int argc; int argc;
const VALUE *argv; const VALUE *argv;
}; };
@ -361,7 +361,7 @@ check_funcall_exec(struct rescue_funcall_args *args)
VALUE new_args = rb_ary_new4(args->argc, args->argv); VALUE new_args = rb_ary_new4(args->argc, args->argv);
VALUE ret; VALUE ret;
rb_ary_unshift(new_args, args->sym); rb_ary_unshift(new_args, ID2SYM(args->mid));
ret = rb_funcall2(args->recv, idMethodMissing, ret = rb_funcall2(args->recv, idMethodMissing,
args->argc+1, RARRAY_CONST_PTR(new_args)); args->argc+1, RARRAY_CONST_PTR(new_args));
RB_GC_GUARD(new_args); RB_GC_GUARD(new_args);
@ -371,7 +371,7 @@ check_funcall_exec(struct rescue_funcall_args *args)
static VALUE static VALUE
check_funcall_failed(struct rescue_funcall_args *args, VALUE e) check_funcall_failed(struct rescue_funcall_args *args, VALUE e)
{ {
if (rb_respond_to(args->recv, SYM2ID(args->sym))) { if (rb_respond_to(args->recv, args->mid)) {
rb_exc_raise(e); rb_exc_raise(e);
} }
return Qundef; return Qundef;
@ -421,7 +421,7 @@ check_funcall_missing(rb_thread_t *th, VALUE klass, VALUE recv, ID mid, int argc
th->method_missing_reason = 0; th->method_missing_reason = 0;
args.recv = recv; args.recv = recv;
args.sym = ID2SYM(mid); args.mid = mid;
args.argc = argc; args.argc = argc;
args.argv = argv; args.argv = argv;
return rb_rescue2(check_funcall_exec, (VALUE)&args, return rb_rescue2(check_funcall_exec, (VALUE)&args,