Automerge '1.1-M1'

Author: teamcity

compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt

@@ -200,13 +200,11 @@ abstract class AnalyzerFacade<in P : PlatformAnalysisParameters> {
 
         addFriends()
 
-        val cache = WeakReferenceSLRUCache<M, ResolverForModule>(storageManager)
-
         fun initializeResolverForProject() {
             modules.forEach {
                 module ->
                 val descriptor = resolverForProject.descriptorForModule(module)
-                val computeResolverForModule = cache.prepareValueComputation(module) {
+                val computeResolverForModule = storageManager.createLazyValue {
                     val content = modulesContent(module)
                     createResolverForModule(
                             module, descriptor, projectContext.withModule(descriptor), modulesContent(module),