[ruby-cvs:51490] nagachika:r44345 (ruby_2_0_0): merge revision(s) 44175, 44179: [Backport #9236]

[nagachika at ruby-lang.org]

nagachika	2013-12-22 23:33:11 +0900 (Sun, 22 Dec 2013)

  New Revision: 44345

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

  Log:
    merge revision(s) 44175,44179: [Backport #9236]
    
    * proc.c (method_owner): return the class where alias is defined, not
      the class original method is defined.
    
    * vm_method.c (rb_method_entry_make, rb_alias): store the originally
      defined class in me.  [Bug #7993] [Bug #7842] [Bug #9236]
    
    * vm_method.c (rb_method_entry_get_without_cache): cache included
      module but not iclass.
    
    * proc.c (mnew_from_me): achieve the original defined_class from
      prepended iclass, to fix inherited owner.
    
    * proc.c (method_owner): return the defined class, but not the
      class which the method object is created from.

  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_method.rb
    branches/ruby_2_0_0/test/ruby/test_module.rb
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/vm_method.c