summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-16 20:30:17 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-16 20:30:17 +0000
commit9182dab459137533a4315bf13d3a921a24e5d76c (patch)
treededf07f11cab4ad4460211637f6c9af2e8d76439
parentdb1e99cdad846fd2bab426ae0cc39c7321fae427 (diff)
* vm_insnhelper.c (vm_invoke_block): vm_caller_setup_args() can skip
when splat flag is not set. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37229 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm_insnhelper.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e50e73d257..9e37cecfd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 17 05:05:07 2012 Koichi Sasada <ko1@atdot.net>
+
+ * vm_insnhelper.c (vm_invoke_block): vm_caller_setup_args() can skip
+ when splat flag is not set.
+
Wed Oct 17 01:53:47 2012 Koichi Sasada <ko1@atdot.net>
* vm_insnhelper.c (vm_getivar, vm_setivar): support index inline cache
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 5e4ad3dc54..072f446f95 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -2032,7 +2032,9 @@ vm_invoke_block(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_info_t *ci
}
iseq = block->iseq;
- vm_caller_setup_args(th, GET_CFP(), ci);
+ if (UNLIKELY(ci->flag & VM_CALL_ARGS_SPLAT)) {
+ vm_caller_setup_args(th, GET_CFP(), ci);
+ }
if (BUILTIN_TYPE(iseq) != T_NODE) {
int opt_pc;