[ruby-cvs:53101] nagachika:r45955 (ruby_2_1): merge revision(s) r45367, r45387, r45388, r45389: [Backport #9475]

[nagachika at ruby-lang.org]

nagachika	2014-05-16 00:24:05 +0900 (Fri, 16 May 2014)

  New Revision: 45955

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

  Log:
    merge revision(s) r45367,r45387,r45388,r45389: [Backport #9475]
    
    * vm_method.c (rb_method_entry_get_without_cache): get rid of
      infinite recursion at aliases in a subclass and a superclass.
      return actually defined class for other than singleton class.
      [ruby-core:60431] [Bug #9475]
    
    * vm_method.c (rb_method_entry_get_without_cache): me->klass is 0
      for a method aliased in a module.  [ruby-core:61636] [Bug #9663]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/test/ruby/test_alias.rb
    branches/ruby_2_1/version.h
    branches/ruby_2_1/vm_method.c