* vm_insnhelper.c (vm_callee_setup_arg_complex, vm_yield_setup_block_args):

  clear keyword arguments to prevent GC bug which occurs
  while marking VM stack.
  [ruby-dev:47729] [Bug #8964]

* test/ruby/test_keyword.rb: tests for the above.

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

3 files changed, 37 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 410ad706d7..c59369acd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sun Sep 29 18:45:05 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm_insnhelper.c (vm_callee_setup_arg_complex, vm_yield_setup_block_args):
+	  clear keyword arguments to prevent GC bug which occurs
+	  while marking VM stack.
+	  [ruby-dev:47729] [Bug #8964]
+
+	* test/ruby/test_keyword.rb: tests for the above.
+
 Sat Sep 28 23:25:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* math.c (math_log, math_log2, math_log10): fix for Bignum argument.
diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb
index c21afe4495..dd4f6d1b42 100644
--- a/test/ruby/test_keyword.rb
+++ b/test/ruby/test_keyword.rb
@@ -396,4 +396,23 @@ class TestKeywordArguments < Test::Unit::TestCase
     assert_equal([{}, {}], a.new.foo({}))
     assert_equal([{}, {:bar=>"x"}], a.new.foo({}, bar: "x"))
   end
+
+  def test_gced_object_in_stack
+    bug8964 = '[ruby-dev:47729] [Bug #8964]'
+    assert_normal_exit %q{
+      def m(a: [])
+      end
+      GC.stress = true
+      tap { m }
+      GC.start
+      tap { m }
+    }, bug8964
+    assert_normal_exit %q{
+      prc = Proc.new {|a: []|}
+      GC.stress = true
+      tap { prc.call }
+      GC.start
+      tap { prc.call }
+    }, bug8964
+  end
 end
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 96b624d014..d82cec1858 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1226,6 +1226,11 @@ vm_callee_setup_arg_complex(rb_thread_t *th, rb_call_info_t *ci, const rb_iseq_t
 
     /* keyword argument */
     if (iseq->arg_keyword != -1) {
+	int i;
+	int arg_keywords_end = iseq->arg_keyword - (iseq->arg_block != -1);
+	for (i = iseq->arg_keywords; 0 < i; i--) {
+	    orig_argv[arg_keywords_end - i] = Qnil;
+	}
 	orig_argv[iseq->arg_keyword] = keyword_hash;
     }
 
@@ -2302,6 +2307,10 @@ vm_yield_setup_block_args(rb_thread_t *th, const rb_iseq_t * iseq,
 
     /* keyword argument */
     if (iseq->arg_keyword != -1) {
+	int arg_keywords_end = iseq->arg_keyword - (iseq->arg_block != -1);
+	for (i = iseq->arg_keywords; 0 < i; i--) {
+	    argv[arg_keywords_end - i] = Qnil;
+	}
 	argv[iseq->arg_keyword] = keyword_hash;
     }