merge revision(s) 51651,51655: [Backport #11451]

	* vm_insnhelper.c (vm_invoke_block): we should not expect ci->argc is
	  stable after invoking a block. [Bug #11451]

	* test/ruby/test_yield.rb: add a test. This test script is given by
	  Alex Dowad.


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

4 files changed, 39 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index fd526e6e1c..d6e2b87d0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Nov 23 00:19:51 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_invoke_block): we should not expect ci->argc is
+	  stable after invoking a block. [Bug #11451]
+
+	* test/ruby/test_yield.rb: add a test. This test script is given by
+	  Alex Dowad.
+
 Thu Nov 19 01:06:07 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* load.c (rb_load_internal0): stop separating exits at loading
diff --git a/test/ruby/test_yield.rb b/test/ruby/test_yield.rb
index 82378d48b4..f12ba2c73d 100644
--- a/test/ruby/test_yield.rb
+++ b/test/ruby/test_yield.rb
@@ -390,4 +390,28 @@ class TestRubyYieldGen < Test::Unit::TestCase
     end
     assert_equal [m, nil], y.s(m){|a,b|[a,b]}
   end
+
+  def test_block_cached_argc
+    # [Bug #11451]
+    assert_separately([], <<-"end;")
+      class Yielder
+        def each
+          yield :x, :y, :z
+        end
+      end
+      class Getter1
+        include Enumerable
+        def each(&block)
+          Yielder.new.each(&block)
+        end
+      end
+      class Getter2
+        include Enumerable
+        def each
+          Yielder.new.each { |a, b, c, d| yield(a) }
+        end
+      end
+      Getter1.new.map{Getter2.new.each{|x|}}
+    end;
+  end
 end
diff --git a/version.h b/version.h
index 6776fd0ca5..1f85640018 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.2.4"
-#define RUBY_RELEASE_DATE "2015-11-19"
-#define RUBY_PATCHLEVEL 193
+#define RUBY_RELEASE_DATE "2015-11-23"
+#define RUBY_PATCHLEVEL 194
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 23
 
 #include "ruby/version.h"
 
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index b40ebe1814..fae13e82c3 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -2094,10 +2094,11 @@ vm_invoke_block(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_info_t *ci
     }
     else {
 	VALUE val;
+	int argc;
 	CALLER_SETUP_ARG(th->cfp, ci);
-	val = vm_yield_with_cfunc(th, block, block->self, block->klass,
-				  ci->argc, STACK_ADDR_FROM_TOP(ci->argc), 0);
-	POPN(ci->argc); /* TODO: should put before C/yield? */
+	argc = ci->argc;
+	val = vm_yield_with_cfunc(th, block, block->self, block->klass, argc, STACK_ADDR_FROM_TOP(argc), 0);
+	POPN(argc); /* TODO: should put before C/yield? */
 	return val;
     }
 }