[ruby-cvs:53303] usa:r46157 (ruby_2_0_0): merge revision(s) 45564, 45565, 45584, 45585: [Backport #9721]

usa at ruby-lang.org usa at ruby-lang.org
Tue May 27 13:54:31 JST 2014


usa	2014-05-27 13:54:29 +0900 (Tue, 27 May 2014)

  New Revision: 46157

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

  Log:
    merge revision(s) 45564,45565,45584,45585: [Backport #9721]
    
    * proc.c (rb_method_call_with_block, umethod_bind): call with
      IClass including the module for a module instance method.
      [ruby-core:61936] [Bug #9721]
    
    * vm_insnhelper.c (vm_search_super_method): allow bound
      UnboundMethod case.
    
    * proc.c (umethod_bind): use the ancestor iclass instead of new
      iclass to get rid of infinite recursion, if the defined module
      is already included.  [ruby-core:62014] [Bug #9721]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/internal.h
    branches/ruby_2_0_0/object.c
    branches/ruby_2_0_0/proc.c
    branches/ruby_2_0_0/test/ruby/test_super.rb
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/vm_insnhelper.c


More information about the ruby-cvs mailing list