merge revision(s) 55609: [Backport #12568]

	* 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/branches/ruby_2_2@55875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 16 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a297465c3a..755fa86fe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Aug 12 11:48:27 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* 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
+
 Fri Aug 12 11:45:02 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/http/generic_rquest.rb (write_header): A Request-Line must
diff --git a/test/ruby/test_lambda.rb b/test/ruby/test_lambda.rb
index 0f3382ce78..b12fcf8834 100644
--- a/test/ruby/test_lambda.rb
+++ b/test/ruby/test_lambda.rb
@@ -71,6 +71,13 @@ class TestLambdaParameters < Test::Unit::TestCase
     assert_raise(ArgumentError, bug9605) {proc(&plus).call [1,2]}
   end
 
+  def test_instance_exec
+    bug12568 = '[ruby-core:76300] [Bug #12568]'
+    assert_nothing_raised(ArgumentError, bug12568) do
+      instance_exec([1,2,3], &->(a=[]){ a })
+    end
+  end
+
   def yield_1(arg)
     yield arg
   end
diff --git a/version.h b/version.h
index 4309eb8e64..7a0cad2548 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-08-12"
-#define RUBY_PATCHLEVEL 347
+#define RUBY_PATCHLEVEL 348
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 8
diff --git a/vm_args.c b/vm_args.c
index abdd161f74..8a094a3d9c 100644
--- a/vm_args.c
+++ b/vm_args.c
@@ -578,6 +578,7 @@ setup_parameters_complex(rb_thread_t * const th, const rb_iseq_t * const iseq, r
       case arg_setup_lambda:
 	if (given_argc == 1 &&
 	    given_argc != iseq->param.lead_num &&
+	    !iseq->param.flags.has_opt &&
 	    !iseq->param.flags.has_rest &&
 	    args_check_block_arg0(args, th)) {
 	    given_argc = RARRAY_LENINT(args->rest);