[ruby-cvs:54198] nagachika:r47051 (ruby_2_1): merge revision(s) r46465, r46469, r46484: [Backport #9961]

nagachika at ruby-lang.org nagachika at ruby-lang.org
Mon Aug 4 01:07:18 JST 2014


nagachika	2014-08-04 01:07:15 +0900 (Mon, 04 Aug 2014)

  New Revision: 47051

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

  Log:
    merge revision(s) r46465,r46469,r46484: [Backport #9961]
    
    * vm.c (rb_vm_rewind_cfp): add new function to rewind specified cfp
      with invoking RUBY_EVENT_C_RETURN.
      [Bug #9961]
    
    * vm_core.h: ditto.
    
    * eval.c (rb_protect): use it.
    
    * eval.c (rb_rescue2): ditto.
    
    * vm_eval.c (rb_iterate): ditto.
    
    * test/ruby/test_settracefunc.rb: add a test.
    
    * vm_core.h (rb_name_err_mesg_new): 
    
    * vm_eval.c (rb_catch_protect): fix same problem of [Bug #9961].
    
    * vm_eval.c (rb_iterate): ditto.
    
    * vm_core.h (rb_vm_rewind_cfp): add the prototype declaration.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/eval.c
    branches/ruby_2_1/test/ruby/test_settracefunc.rb
    branches/ruby_2_1/version.h
    branches/ruby_2_1/vm.c
    branches/ruby_2_1/vm_core.h
    branches/ruby_2_1/vm_eval.c


More information about the ruby-cvs mailing list