vm_insnhelper.c: allow to_ary

* vm_insnhelper.c (vm_callee_setup_arg{_complex,}): try conversion
  by to_ary for a lambda, as well as a proc.
  [ruby-core:65887] [Bug #9605]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 34 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e7909f11c9..e000a2c70e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct 30 11:16:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_callee_setup_arg{_complex,}): try conversion
+	  by to_ary for a lambda, as well as a proc.
+	  [ruby-core:65887] [Bug #9605]
+
 Wed Oct 29 21:13:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (gettable_gen): warn circular argument reference, for
diff --git a/test/ruby/test_lambda.rb b/test/ruby/test_lambda.rb
index 40a6b84021..0f3382ce78 100644
--- a/test/ruby/test_lambda.rb
+++ b/test/ruby/test_lambda.rb
@@ -71,6 +71,32 @@ class TestLambdaParameters < Test::Unit::TestCase
     assert_raise(ArgumentError, bug9605) {proc(&plus).call [1,2]}
   end
 
+  def yield_1(arg)
+    yield arg
+  end
+
+  tap do |;bug9605, expected, result|
+    bug9605 = '[ruby-core:65887] [Bug #9605] arity check should be relaxed'
+    expected = [1,2,3]
+
+    [
+      ["array",  expected],
+      ["to_ary", Struct.new(:to_ary).new(expected)],
+    ].product \
+    [
+      ["proc",   proc {|a, b, c| [a, b, c]}],
+      ["lambda", lambda {|a, b, c| [a, b, c]}],
+    ] do
+      |(vtype, val), (btype, block)|
+      define_method("test_yeild_relaxed(#{vtype},&#{btype})") do
+        result = assert_nothing_raised(ArgumentError, bug9605) {
+          break yield_1(val, &block)
+        }
+        assert_equal(expected, result, bug9605)
+      end
+    end
+  end
+
   def foo
     assert_equal(nil, ->(&b){ b }.call)
   end
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 495b7224fd..e3e91729b0 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1140,7 +1140,7 @@ vm_callee_setup_arg_complex(rb_thread_t *th, rb_call_info_t *ci, const rb_iseq_t
 	long len;
 	if (!splattable ||
 	    argc != 1 ||
-	    !RB_TYPE_P(arg0 = argv[0], T_ARRAY) ||
+	    NIL_P(arg0 = rb_check_array_type(argv[0])) ||
 	    (len = RARRAY_LEN(arg0)) < (long)min ||
 	    (len > (long)max && max != UNLIMITED_ARGUMENTS)) {
 	    argument_error(iseq, argc, min, max);
@@ -1238,7 +1238,7 @@ vm_callee_setup_arg(rb_thread_t *th, rb_call_info_t *ci, const rb_iseq_t *iseq,
 	    long len;
 	    if (!(is_lambda > 1) ||
 		ci->argc != 1 ||
-		!RB_TYPE_P(arg0 = argv[0], T_ARRAY) ||
+		NIL_P(arg0 = rb_check_array_type(argv[0])) ||
 		(len = RARRAY_LEN(arg0)) != (long)iseq->argc) {
 		argument_error(iseq, ci->argc, iseq->argc, iseq->argc);
 	    }