From c28b5723f6615fa429fc5b2606eb1b5b43bdb197 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 12 Mar 2014 02:19:13 +0000 Subject: vm_insnhelper.c: disable fastpath if splat * vm_insnhelper.c (vm_callee_setup_arg): disable fastpath if splat argument, since argc may differ for each calls. [ruby-core:61422] [Bug #9622] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_insnhelper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'vm_insnhelper.c') diff --git a/vm_insnhelper.c b/vm_insnhelper.c index a7b137c614..6c050440c7 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1210,7 +1210,9 @@ vm_callee_setup_arg(rb_thread_t *th, rb_call_info_t *ci, const rb_iseq_t *iseq, (UNLIKELY(ci->flag & VM_CALL_TAILCALL) ? vm_call_iseq_setup_tailcall : vm_call_iseq_setup_normal), - !is_lambda && !(ci->me->flag & NOEX_PROTECTED)); + (!is_lambda && + !(ci->flag & VM_CALL_ARGS_SPLAT) && /* argc may differ for each calls */ + !(ci->me->flag & NOEX_PROTECTED))); } else { ci->aux.opt_pc = vm_callee_setup_arg_complex(th, ci, iseq, argv); -- cgit v1.2.3