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

* class.c (include_modules_at): invalidate method cache if included

Browse source 
module contains constants

* test/ruby/test_module.rb: add test

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41175 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
charliesome 2013-06-08 10:48:33 +00:00
parent 6c5000b5f1
commit b512e61ca0
3 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sat Jun 8 19:47:00 2013 Charlie Somerville <charliesome@ruby-lang.org>
* class.c (include_modules_at): invalidate method cache if included
module contains constants
* test/ruby/test_module.rb: add test
Sat Jun 8 19:31:00 2013 Charlie Somerville <charliesome@ruby-lang.org>
* random.c (limited_big_rand): declare rnd, lim and mask as uint32_t

2
class.c
View file

@ -760,6 +760,8 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module)
}
if (RMODULE_M_TBL(module) && RMODULE_M_TBL(module)->num_entries)
changed = 1;
if (RMODULE_CONST_TBL(module) && RMODULE_CONST_TBL(module)->num_entries)
changed = 1;
skip:
module = RCLASS_SUPER(module);
}

20
test/ruby/test_module.rb
View file

@ -1759,6 +1759,26 @@ class TestModule < Test::Unit::TestCase
assert_raise(NoMethodError, bug8284) {Object.define_method}
end
def test_include_module_with_constants_invalidates_method_cache
assert_in_out_err([], <<-RUBY, %w(123 456), [])
A = 123
class Foo
def self.a
A
end
end
module M
A = 456
end
puts Foo.a
Foo.send(:include, M)
puts Foo.a
RUBY
end
private
def assert_top_method_is_private(method)