Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix #2390 : Incomplete cleaning of caches in
`AbstractModelLoader.removeDeclarations()`
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4954,71 +4954,116 @@ private Declaration findLanguageModuleDeclarationForBootstrap(String name) { | |
| throw new ModelResolutionException("Failed to look up given type in language module while bootstrapping: "+name); | ||
| } | ||
|
|
||
| public ClassMirror[] getClassMirrorsToRemove(com.redhat.ceylon.model.typechecker.model.Declaration declaration) { | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
quintesse
Member
|
||
| if(declaration instanceof LazyClass){ | ||
| return new ClassMirror[] { ((LazyClass) declaration).classMirror }; | ||
| } | ||
| if(declaration instanceof LazyInterface){ | ||
| LazyInterface lazyInterface = (LazyInterface) declaration; | ||
| if (lazyInterface.companionClass != null) { | ||
| return new ClassMirror[] { lazyInterface.classMirror, lazyInterface.companionClass }; | ||
| } else { | ||
| return new ClassMirror[] { lazyInterface.classMirror }; | ||
| } | ||
| } | ||
| if(declaration instanceof LazyFunction){ | ||
| return new ClassMirror[] { ((LazyFunction) declaration).classMirror }; | ||
| } | ||
| if(declaration instanceof LazyValue){ | ||
| return new ClassMirror[] { ((LazyValue) declaration).classMirror }; | ||
| } | ||
| if (declaration instanceof LazyClassAlias) { | ||
| return new ClassMirror[] { ((LazyClassAlias) declaration).classMirror }; | ||
| } | ||
| if (declaration instanceof LazyInterfaceAlias) { | ||
| return new ClassMirror[] { ((LazyInterfaceAlias) declaration).classMirror }; | ||
| } | ||
| if (declaration instanceof LazyTypeAlias) { | ||
| return new ClassMirror[] { ((LazyTypeAlias) declaration).classMirror }; | ||
| } | ||
| return new ClassMirror[0]; | ||
| } | ||
|
|
||
| public void removeDeclarations(List<Declaration> declarations) { | ||
| synchronized(getLock()){ | ||
| Set<String> qualifiedNames = new HashSet<>(declarations.size() * 2); | ||
|
|
||
| // keep in sync with getOrCreateDeclaration | ||
| for (Declaration decl : declarations) { | ||
| try { | ||
| ClassMirror[] classMirrors = getClassMirrorsToRemove(decl); | ||
| if (classMirrors == null || classMirrors.length == 0) { | ||
| continue; | ||
| } | ||
|
|
||
| Map<String, Declaration> firstCache = null; | ||
| Map<String, Declaration> secondCache = null; | ||
| // String firstCacheName = null; | ||
| // String secondCacheName = null; | ||
| if(decl.isToplevel()){ | ||
| if(JvmBackendUtil.isValue(decl)){ | ||
| firstCache = valueDeclarationsByName; | ||
| // firstCacheName = "value declarations cache"; | ||
| TypeDeclaration typeDeclaration = ((Value)decl).getTypeDeclaration(); | ||
| if (typeDeclaration != null) { | ||
| if(typeDeclaration.isAnonymous()) { | ||
| secondCache = typeDeclarationsByName; | ||
| // secondCacheName = "type declarations cache"; | ||
| } | ||
| } else { | ||
| // The value declaration has probably not been fully loaded yet. | ||
| // => still try to clean the second cache also, just in case it is an anonymous object | ||
| secondCache = typeDeclarationsByName; | ||
| // secondCacheName = "type declarations cache"; | ||
| } | ||
| }else if(JvmBackendUtil.isMethod(decl)) { | ||
| firstCache = valueDeclarationsByName; | ||
| // firstCacheName = "value declarations cache"; | ||
| } | ||
| } | ||
| if(decl instanceof ClassOrInterface){ | ||
| firstCache = typeDeclarationsByName; | ||
| // firstCacheName = "type declarations cache"; | ||
| } | ||
|
|
||
| Module module = ModelUtil.getModuleContainer(decl.getContainer()); | ||
| // ignore declarations which we do not cache, like member method/attributes | ||
|
|
||
| for (ClassMirror classMirror : classMirrors) { | ||
| qualifiedNames.add(classMirror.getQualifiedName()); | ||
| String key = classMirror.getCacheKey(module); | ||
|
|
||
| // String notRemovedMessageFromFirstCache = "No non-null declaration removed from the " + firstCacheName + " for key :" + key; | ||
| // String notRemovedMessageFromSecondCache = "No non-null declaration removed from the " + secondCacheName + " for key :" + key; | ||
| if(firstCache != null) { | ||
| if (firstCache.remove(key) == null) { | ||
| // System.out.println(notRemovedMessageFromFirstCache); | ||
| } | ||
|
|
||
| if(secondCache != null) { | ||
| if (secondCache.remove(key) == null) { | ||
| // System.out.println(notRemovedMessageFromSecondCache); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } catch(Exception e) { | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
|
|
||
| List<String> keysToRemove = new ArrayList<>(qualifiedNames.size()); | ||
| for (Map.Entry<String, ClassMirror> entry : classMirrorCache.entrySet()) { | ||
| ClassMirror mirror = entry.getValue(); | ||
| if (mirror == null | ||
| || qualifiedNames.contains(mirror.getQualifiedName())) { | ||
| keysToRemove.add(entry.getKey()); | ||
| } | ||
| } | ||
|
|
||
| for (String keyToRemove : keysToRemove) { | ||
| classMirrorCache.remove(keyToRemove); | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
You call this from the IDE too? Or could it be private?