[ruby-cvs:54487] usa:r47339 (ruby_2_0_0): merge revision(s) 46463: [Backport #9957]

usa at ruby-lang.org usa at ruby-lang.org
Sun Aug 31 16:39:17 JST 2014


usa	2014-08-31 16:39:15 +0900 (Sun, 31 Aug 2014)

  New Revision: 47339

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

  Log:
    merge revision(s) 46463: [Backport #9957]
    
    * vm_core.h: add VM_FRAME_MAGIC_RESCUE to recognize normal block or
      rescue clause.
    
    * vm.c (vm_exec): use VM_FRAME_MAGIC_RESCUE on at rescue/ensure.
    
    * test/ruby/test_settracefunc.rb: should not invoke b_return at rescue
      clause.
      [Bug #9957]
    
    * vm_dump.c (control_frame_dump): check VM_FRAME_MAGIC_RESCUE.
    
    * vm_dump.c (vm_stack_dump_each): ditto.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    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_dump.c


More information about the ruby-cvs mailing list