archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 45367,45387,45388,45389: [Backport #9475]

Browse source 
* 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]

* 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]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2014-04-30 07:26:33 +00:00
parent 16a10e0a95
commit 0b9f01644b
4 changed files with 85 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
vm_method.c
View file

@ -534,8 +534,15 @@ rb_method_entry_get_without_cache(VALUE klass, ID id,
VALUE defined_class;
rb_method_entry_t *me = search_method(klass, id, &defined_class);
if (me && RB_TYPE_P(me->klass, T_ICLASS))
defined_class = me->klass;
if (me && me->klass) {
switch (BUILTIN_TYPE(me->klass)) {
case T_CLASS:
if (RBASIC(klass)->flags & FL_SINGLETON) break;
/* fall through */
case T_ICLASS:
defined_class = me->klass;
}
}
if (ruby_running) {
struct cache_entry *ent;