[ruby-cvs:54155] nagachika:r47009 (ruby_2_1): merge revision(s) r46419, r46429: [Backport #9940]

[nagachika at ruby-lang.org]

nagachika	2014-07-31 00:52:15 +0900 (Thu, 31 Jul 2014)

  New Revision: 47009

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

  Log:
    merge revision(s) r46419,r46429: [Backport #9940]
    
    * vm_trace.c: clear and restore recursive checking thread local data
      to avoid unexpected throw from TracePoint.
      [Bug #9940]
    
    * test/ruby/test_settracefunc.rb: add a test.
    
    * thread.c: adde
      * rb_threadptr_reset_recursive_data(rb_thread_t *th);
      * rb_threadptr_restore_recursive_data(rb_thread_t *th, VALUE old);
    
    * vm_core.h: ditto.
    
    * thread.c: added

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/test/ruby/test_settracefunc.rb
    branches/ruby_2_1/thread.c
    branches/ruby_2_1/version.h
    branches/ruby_2_1/vm_core.h
    branches/ruby_2_1/vm_trace.c