kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

vm_method.c: check if klass is 0

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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45387 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-03-23 02:03:51 +00:00
parent 10cf7c5b2a
commit bedc6fdf88
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Mar 23 11:03:27 2014 Kohei Suzuki <eagletmt@gmail.com>
* 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]
Sun Mar 23 08:12:27 2014 Eric Wong <e@80x24.org> Sun Mar 23 08:12:27 2014 Eric Wong <e@80x24.org>
* st.c (hash_pos): use bitwise AND to avoid slow modulo op * st.c (hash_pos): use bitwise AND to avoid slow modulo op

15
test/ruby/test_alias.rb
View file

@ -179,4 +179,19 @@ class TestAlias < Test::Unit::TestCase
assert_equal("ABC", c.new.foo, bug9475) assert_equal("ABC", c.new.foo, bug9475)
end end
end end
def test_alias_in_module
bug9663 = '[ruby-core:61635] [Bug #9663]'
assert_separately(['-', bug9663], <<-'end;')
bug = ARGV[0]
m = Module.new do
alias orig_to_s to_s
end
o = Object.new.extend(m)
assert_equal(o.to_s, o.orig_to_s, bug)
end;
end
end end

2
vm_method.c
View file

@ -578,7 +578,7 @@ rb_method_entry_get_without_cache(VALUE klass, ID id,
VALUE defined_class; VALUE defined_class;
rb_method_entry_t *me = search_method(klass, id, &defined_class); rb_method_entry_t *me = search_method(klass, id, &defined_class);
if (me) { if (me && !me->klass) {
switch (BUILTIN_TYPE(me->klass)) { switch (BUILTIN_TYPE(me->klass)) {
case T_CLASS: case T_CLASS:
if (RBASIC(klass)->flags & FL_SINGLETON) break; if (RBASIC(klass)->flags & FL_SINGLETON) break;