[ruby-cvs:54158] nagachika:r47012 (ruby_2_1): merge revision(s) r46463: [Backport #9957]

nagachika at ruby-lang.org nagachika at ruby-lang.org
Thu Jul 31 01:21:06 JST 2014


nagachika	2014-07-31 01:21:05 +0900 (Thu, 31 Jul 2014)

  New Revision: 47012

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

  Log:
    merge revision(s) r46463: [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_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    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_dump.c


More information about the ruby-cvs mailing list