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_insnhelper.c (vm_call_method): disable CI_SET_FASTPATH() if

Browse source 
this method call needs splat argument because cahced functions
  (vm_call_attrset, vm_call_ivar, vm_call_cfunc_fast_(unary|binary))
  do not check an arity.
* bootstraptest/test_method.rb: add a test to check an above issue.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2012-10-15 21:35:29 +00:00
parent 90a6dce041
commit 3083ad7b83
3 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Tue Oct 16 06:29:18 2012 Koichi Sasada <ko1@atdot.net>
* vm_insnhelper.c (vm_call_method): disable CI_SET_FASTPATH() if
this method call needs splat argument because cahced functions
(vm_call_attrset, vm_call_ivar, vm_call_cfunc_fast_(unary|binary))
do not check an arity.
* bootstraptest/test_method.rb: add a test to check an above issue.
Tue Oct 16 06:15:44 2012 Koichi Sasada <ko1@atdot.net> Tue Oct 16 06:15:44 2012 Koichi Sasada <ko1@atdot.net>
* method.h: introduce new method type VM_METHOD_TYPE_CFUNC_FAST. * method.h: introduce new method type VM_METHOD_TYPE_CFUNC_FAST.

20
bootstraptest/test_method.rb
View file

@ -1184,3 +1184,23 @@ assert_equal 'ok', %q{
'ok' 'ok'
}, '[ruby-core:30534]' }, '[ruby-core:30534]'
# should not cache when splat
assert_equal 'ok', %q{
class C
attr_reader :a
def initialize
@a = 1
end
end
def m *args
C.new.a(*args)
end
m()
begin
m(1)
rescue ArgumentError
'ok'
end
}

8
vm_insnhelper.c
View file

@ -1523,13 +1523,13 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci)
} }
case VM_METHOD_TYPE_ATTRSET:{ case VM_METHOD_TYPE_ATTRSET:{
rb_check_arity(ci->argc, 0, 1); rb_check_arity(ci->argc, 0, 1);
CI_SET_FASTPATH(ci, vm_call_attrset, enable_fastpath); CI_SET_FASTPATH(ci, vm_call_attrset, enable_fastpath && !(ci->flag & VM_CALL_ARGS_SPLAT));
val = vm_call_attrset(th, cfp, ci); val = vm_call_attrset(th, cfp, ci);
break; break;
} }
case VM_METHOD_TYPE_IVAR:{ case VM_METHOD_TYPE_IVAR:{
rb_check_arity(ci->argc, 0, 0); rb_check_arity(ci->argc, 0, 0);
CI_SET_FASTPATH(ci, vm_call_ivar, enable_fastpath); CI_SET_FASTPATH(ci, vm_call_ivar, enable_fastpath && !(ci->flag & VM_CALL_ARGS_SPLAT));
val = vm_call_ivar(th, cfp, ci); val = vm_call_ivar(th, cfp, ci);
break; break;
} }
@ -1577,12 +1577,12 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci)
switch (ci->me->def->body.cfunc.argc) { switch (ci->me->def->body.cfunc.argc) {
case 0: case 0:
rb_check_arity(ci->argc, 0, 0); rb_check_arity(ci->argc, 0, 0);
CI_SET_FASTPATH(ci, vm_call_cfunc_fast_unary, enable_fastpath); CI_SET_FASTPATH(ci, vm_call_cfunc_fast_unary, enable_fastpath && !(ci->flag & VM_CALL_ARGS_SPLAT));
val = vm_call_cfunc_fast_unary(th, cfp, ci); val = vm_call_cfunc_fast_unary(th, cfp, ci);
break; break;
case 1: case 1:
rb_check_arity(ci->argc, 0, 1); rb_check_arity(ci->argc, 0, 1);
CI_SET_FASTPATH(ci, vm_call_cfunc_fast_binary, enable_fastpath); CI_SET_FASTPATH(ci, vm_call_cfunc_fast_binary, enable_fastpath && !(ci->flag & VM_CALL_ARGS_SPLAT));
val = vm_call_cfunc_fast_binary(th, cfp, ci); val = vm_call_cfunc_fast_binary(th, cfp, ci);
break; break;
default: default: