[ruby-cvs:57710] nagachika:r50562 (ruby_2_2): merge revision(s) 50172, 50173: [Backport #11027]

[nagachika at ruby-lang.org]

nagachika	2015-05-21 01:04:34 +0900 (Thu, 21 May 2015)

  New Revision: 50562

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50562

  Log:
    merge revision(s) 50172,50173: [Backport #11027]
    
    * vm_args.c: protect value stack from calling other methods
      during complex parameter setting process (splat, kw, and so on).
      [Bug #11027]
    
    * vm_core.h: remove rb_thead_t::mark_stack_len.
      With this modification, we don't need to use th->mark_stack_len.
    
    * test/ruby/test_keyword.rb: add a test.
    
    * cont.c (cont_capture): catch up this fix.
    
    * vm.c (rb_thread_mark): ditto.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/cont.c
    branches/ruby_2_2/test/ruby/test_keyword.rb
    branches/ruby_2_2/version.h
    branches/ruby_2_2/vm.c
    branches/ruby_2_2/vm_args.c
    branches/ruby_2_2/vm_core.h