From 489ffc5acbd344bad7c7adfedfa21f5c5d6a66f1 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Fri, 3 Feb 2023 21:18:38 +0100
Subject: [PATCH] [Analysis API] remove caches from KtFirScopeProvider

The hit-rate for this cache seems to be very law and it causes additional memory consumption

^KTIJ-22749
---
 .../api/fir/components/KtFirScopeProvider.kt  | 83 ++++++++-----------
 1 file changed, 33 insertions(+), 50 deletions(-)

diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt
index b8d278b3ac5..357742daa7e 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt
@@ -45,7 +45,6 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.utils.addToStdlib.applyIf
-import java.util.*
 
 internal class KtFirScopeProvider(
     override val analysisSession: KtFirAnalysisSession,
@@ -56,12 +55,6 @@ internal class KtFirScopeProvider(
     // KtFirScopeProvider is thread local, so it's okay to use the same session here
     private val scopeSession = analysisSession.getScopeSessionFor(analysisSession.useSiteSession)
 
-    private val memberScopeCache = IdentityHashMap<KtSymbolWithMembers, KtScope>()
-    private val declaredMemberScopeCache = IdentityHashMap<KtSymbolWithMembers, KtScope>()
-    private val delegatedMemberScopeCache = IdentityHashMap<KtSymbolWithMembers, KtScope>()
-    private val fileScopeCache = IdentityHashMap<KtFileSymbol, KtScope>()
-    private val packageMemberScopeCache = IdentityHashMap<KtPackageSymbol, KtScope>()
-
     private inline fun <T> KtSymbolWithMembers.withFirForScope(crossinline body: (FirClass) -> T): T? {
         return when (this) {
             is KtFirNamedClassOrObjectSymbol -> body(firSymbol.fir)
@@ -78,19 +71,17 @@ internal class KtFirScopeProvider(
     }
 
     override fun getMemberScope(classSymbol: KtSymbolWithMembers): KtScope {
-        return memberScopeCache.getOrPut(classSymbol) {
-            val firScope = classSymbol.withFirForScope { fir ->
-                fir.lazyResolveToPhase(FirResolvePhase.STATUS)
-                val firSession = analysisSession.useSiteSession
-                fir.unsubstitutedScope(
-                    firSession,
-                    scopeSession,
-                    withForcedTypeCalculator = false
-                )
-            }?.applyIf(classSymbol is KtEnumEntrySymbol, ::EnumEntryContainingNamesAwareScope)
-                ?: return@getOrPut getEmptyScope()
-            KtFirDelegatingScope(firScope, builder)
-        }
+        val firScope = classSymbol.withFirForScope { fir ->
+            fir.lazyResolveToPhase(FirResolvePhase.STATUS)
+            val firSession = analysisSession.useSiteSession
+            fir.unsubstitutedScope(
+                firSession,
+                scopeSession,
+                withForcedTypeCalculator = false
+            )
+        }?.applyIf(classSymbol is KtEnumEntrySymbol, ::EnumEntryContainingNamesAwareScope)
+            ?: return getEmptyScope()
+        return KtFirDelegatingScope(firScope, builder)
     }
 
     override fun getStaticMemberScope(symbol: KtSymbolWithMembers): KtScope {
@@ -106,43 +97,37 @@ internal class KtFirScopeProvider(
     }
 
     override fun getDeclaredMemberScope(classSymbol: KtSymbolWithMembers): KtScope {
-        return declaredMemberScopeCache.getOrPut(classSymbol) {
-            val firScope = classSymbol.withFirForScope {
-                analysisSession.useSiteSession.declaredMemberScope(it)
-            } ?: return@getOrPut getEmptyScope()
+        val firScope = classSymbol.withFirForScope {
+            analysisSession.useSiteSession.declaredMemberScope(it)
+        } ?: return getEmptyScope()
 
-            KtFirDelegatingScope(firScope, builder)
-        }
+        return KtFirDelegatingScope(firScope, builder)
     }
 
     override fun getDelegatedMemberScope(classSymbol: KtSymbolWithMembers): KtScope {
         val declaredScope = (getDeclaredMemberScope(classSymbol) as? KtFirDelegatingScope)?.firScope
-            ?: return delegatedMemberScopeCache.getOrPut(classSymbol) { getEmptyScope() }
-        return delegatedMemberScopeCache.getOrPut(classSymbol) {
-            val firScope = classSymbol.withFirForScope { fir ->
-                fir.lazyResolveToPhase(FirResolvePhase.STATUS)
-                val delegateFields = fir.delegateFields
-                if (delegateFields.isNotEmpty()) {
-                    val firSession = analysisSession.useSiteSession
-                    FirDelegatedMemberScope(
-                        firSession,
-                        scopeSession,
-                        fir,
-                        declaredScope,
-                        delegateFields
-                    )
-                } else null
-            } ?: return@getOrPut getEmptyScope()
+            ?: return getEmptyScope()
+        val firScope = classSymbol.withFirForScope { fir ->
+            fir.lazyResolveToPhase(FirResolvePhase.STATUS)
+            val delegateFields = fir.delegateFields
+            if (delegateFields.isNotEmpty()) {
+                val firSession = analysisSession.useSiteSession
+                FirDelegatedMemberScope(
+                    firSession,
+                    scopeSession,
+                    fir,
+                    declaredScope,
+                    delegateFields
+                )
+            } else null
+        } ?: return getEmptyScope()
 
-            KtFirDelegatedMemberScope(firScope, builder)
-        }
+        return KtFirDelegatedMemberScope(firScope, builder)
     }
 
     override fun getFileScope(fileSymbol: KtFileSymbol): KtScope {
-        return fileScopeCache.getOrPut(fileSymbol) {
             check(fileSymbol is KtFirFileSymbol) { "KtFirScopeProvider can only work with KtFirFileSymbol, but ${fileSymbol::class} was provided" }
-            KtFirFileScope(fileSymbol, builder)
-        }
+        return KtFirFileScope(fileSymbol, builder)
     }
 
     override fun getEmptyScope(): KtScope {
@@ -150,9 +135,7 @@ internal class KtFirScopeProvider(
     }
 
     override fun getPackageScope(packageSymbol: KtPackageSymbol): KtScope {
-        return packageMemberScopeCache.getOrPut(packageSymbol) {
-            createPackageScope(packageSymbol.fqName)
-        }
+        return createPackageScope(packageSymbol.fqName)
     }