aboutsummaryrefslogtreecommitdiffstats
path: root/vm_args.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-07 18:59:38 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-07 18:59:38 +0000
commit01c201080383e42c95b2d5780e2df72916dc7476 (patch)
tree58f7c1aac414fceb00a3d5bdc1f003406d610c9c /vm_args.c
parentd9c0993f2d0c909c55cbae35eef0f053620ae506 (diff)
downloadruby-01c201080383e42c95b2d5780e2df72916dc7476.tar.gz
* vm_args.c (setup_parameters_complex): don't raise ArgumentError
if an array is given for instance_exec with optional argument. [ruby-core:76300] [Bug #12568] https://github.com/rails/rails/pull/25699 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_args.c')
-rw-r--r--vm_args.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/vm_args.c b/vm_args.c
index 0f5a3155a2..4917b7f360 100644
--- a/vm_args.c
+++ b/vm_args.c
@@ -587,6 +587,7 @@ setup_parameters_complex(rb_thread_t * const th, const rb_iseq_t * const iseq,
case arg_setup_lambda:
if (given_argc == 1 &&
given_argc != iseq->body->param.lead_num &&
+ !iseq->body->param.flags.has_opt &&
!iseq->body->param.flags.has_rest &&
args_check_block_arg0(args, th)) {
given_argc = RARRAY_LENINT(args->rest);