[ruby-cvs:54490] usa:r47342 (ruby_2_0_0): merge revision(s) 46465, 46469, 46484: [Backport #9961]
usa at ruby-lang.org
usa at ruby-lang.org
Sun Aug 31 17:14:18 JST 2014
usa 2014-08-31 17:14:15 +0900 (Sun, 31 Aug 2014)
New Revision: 47342
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47342
Log:
merge revision(s) 46465,46469,46484: [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_0_0/
Modified files:
branches/ruby_2_0_0/ChangeLog
branches/ruby_2_0_0/eval.c
branches/ruby_2_0_0/test/ruby/test_settracefunc.rb
branches/ruby_2_0_0/version.h
branches/ruby_2_0_0/vm.c
branches/ruby_2_0_0/vm_core.h
branches/ruby_2_0_0/vm_eval.c
More information about the ruby-cvs
mailing list