From d88fc864e4fa00e5bfd04329d7edaf11226ee06f Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Tue, 12 Jul 2016 12:41:15 +0300
Subject: [PATCH] Revert "Use weak-reference based SLRU cache for module
 resolvers"

This reverts commit 28e33aaf56088472618c64f288381fc54865bba8.

Reverting is necessary because this change leads to complicated
exceptions, while it's usefulness is not that obvious.

 #EA-82372 Fixed
---
 .../kotlin/analyzer/AnalyzerFacade.kt         |  4 +-
 .../kotlin/analyzer/WeakReferenceSLRUCache.kt | 64 -------------------
 2 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 compiler/frontend/src/org/jetbrains/kotlin/analyzer/WeakReferenceSLRUCache.kt

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
index 0da33a9307a..6a62562332e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
+++ b/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),
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/WeakReferenceSLRUCache.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/WeakReferenceSLRUCache.kt
deleted file mode 100644
index 27513774513..00000000000
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/WeakReferenceSLRUCache.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.analyzer
-
-import com.intellij.util.containers.ContainerUtil
-import com.intellij.util.containers.SLRUMap
-import org.jetbrains.kotlin.storage.StorageManager
-
-class WeakReferenceSLRUCache<in K : Any, V : Any>(private val storageManager: StorageManager) {
-    private val weakValueMap = ContainerUtil.createConcurrentWeakValueMap<K, V>()
-    // Store most recently used values in SLRU cache to make them available even if no other references to them exist
-    private val recentlyUsed = SLRUMap<V, Any>(20, 20)
-
-    fun prepareValueComputation(module: K, computation: () -> V): () -> V = {
-        getOrCompute(module, computation)
-    }
-
-    private fun getOrCompute(module: K, computation: () -> V): V {
-        getFromWeakValueMap(module)?.let {
-            return it
-        }
-
-        return storageManager.compute {
-            getFromWeakValueMap(module)?.let {
-                return@compute it
-            }
-
-            val result = computation()
-            weakValueMap[module] = result
-
-            recentlyUsed.put(result, STUB_OBJECT)
-
-            result
-        }
-    }
-
-    private fun getFromWeakValueMap(module: K) =
-            weakValueMap[module]?.let {
-                recordAccess(it)
-                it
-            }
-
-    private fun recordAccess(resolver: V) {
-        storageManager.compute {
-            recentlyUsed.get(resolver)
-        }
-    }
-}
-
-private val STUB_OBJECT = Any()