[ruby-cvs:54159] nagachika:r47013 (ruby_2_1): merge revision(s) r46464: [Backport #9959]

[nagachika at ruby-lang.org]

nagachika	2014-07-31 01:37:33 +0900 (Thu, 31 Jul 2014)

  New Revision: 47013

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

  Log:
    merge revision(s) r46464: [Backport #9959]
    
    * vm.c (invoke_block_from_c): move call/return event timing for
      bmethod. It can invoke inconsistent call event if this call raises
      argument error.
      [Bug #9959]
    
    * vm_insnhelper.c (vm_call_bmethod_body): ditto.
    
    * test/ruby/test_settracefunc.rb: add a test.

  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_insnhelper.c