From c016898e79edec4fe3c5106ba7e7742a5eaa3f17 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 7 Jul 2016 18:59:38 +0000
Subject: * 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
---
 vm_args.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'vm_args.c')

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);
-- 
cgit v1.2.3