[ruby-cvs:51656] nagachika:r44511 (ruby_2_0_0): merge revision(s) 44455, 44458, 44510: [Backport #9315]

nagachika at ruby-lang.org nagachika at ruby-lang.org
Tue Jan 7 01:35:48 JST 2014


nagachika	2014-01-07 01:35:45 +0900 (Tue, 07 Jan 2014)

  New Revision: 44511

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

  Log:
    merge revision(s) 44455,44458,44510: [Backport #9315]
    
    * vm_insnhelper.c (vm_search_super_method): direct superclass of a
      module is found when super called in a Method object generated a
      method defined in a module, call method_missing in that case.
      [ruby-core:59358] [Bug #9315]
    
    * proc.c (mnew_from_me): keep iclass as-is, to make inheritance
      chain consistent.  [ruby-core:59358] [Bug #9315]
    
    * proc.c (method_owner): return the original defined_class from
      prepended iclass, instead.

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


More information about the ruby-cvs mailing list