[ruby-cvs:53074] nagachika:r45928 (ruby_2_1): merge revision(s) r45758, r45759: [Backport #9759]

nagachika at ruby-lang.org nagachika at ruby-lang.org
Mon May 12 22:49:33 JST 2014


nagachika	2014-05-12 22:49:33 +0900 (Mon, 12 May 2014)

  New Revision: 45928

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

  Log:
    merge revision(s) r45758,r45759: [Backport #9759]
    
    * vm.c (invoke_block_from_c): add VM_FRAME_FLAG_BMETHOD to record
      it is bmethod frame.
    
    * vm.c (vm_exec): invoke RUBY_EVENT_RETURN event if rollbacked frame
      is VM_FRAME_FLAG_BMETHOD.
      [Bug #9759]
    
    * test/ruby/test_settracefunc.rb: add a test for TracePoint/set_trace_func.
    
    * vm_core.h: rename rb_thread_t::passed_me to
      rb_thread_t::passed_bmethod_me to clarify the usage.
    
    * vm_insnhelper.c (vm_call_bmethod_body): use renamed member.

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


More information about the ruby-cvs mailing list