Skip to content

Invalidate constant cache if included module has constants #795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
headius merged 2 commits into from
Jun 8, 2013
Merged

Invalidate constant cache if included module has constants #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e15b604
invalidate constant cache if included module has constants
Jun 8, 2013
8ca86d5
add test
Jun 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/org/jruby/RubyModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@ public synchronized void includeModule(IRubyObject arg) {
doIncludeModule(module);
invalidateCoreClasses();
invalidateCacheDescendants();
invalidateConstantCacheForModuleInclusion(module);
}

public void defineAnnotatedMethod(Class clazz, String name) {
Expand Down Expand Up @@ -974,6 +975,16 @@ private CacheEntry cacheHit(String name) {

return null;
}

private void invalidateConstantCacheForModuleInclusion(RubyModule module)
{
for (RubyModule mod : gatherModules(module)) {
if (!mod.getConstantMap().isEmpty()) {
invalidateConstantCache();
break;
}
}
}

protected static abstract class CacheEntryFactory {
public abstract CacheEntry newCacheEntry(DynamicMethod method, int token);
Expand Down
25 changes: 25 additions & 0 deletions test/test_including_module_busts_constant_caches.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
require "test/unit"

class TestIncludingModuleBustsConstantCaches < Test::Unit::TestCase
module M
A = 123
end

module N
A = 456
end

class Foo
include M

def self.get
A
end
end

def test_including_module_busts_constant_caches
assert_equal 123, Foo.get
Foo.send(:include, N)
assert_equal 456, Foo.get
end
end