azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Cache deserialized builtin functions

Browse Source 
Apparently `FirBuiltinSymbolProvider` cached deserialized classes but
  created new fir functions for each invocation

^KT-61637
This commit is contained in:
Dmitriy Novozhilov
2023-09-01 16:00:17 +03:00
committed by Space Team
parent 36cb869ac2
commit 3f3c839c48
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt
+18 -8
View File
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.descriptors.SourceElement
import org.jetbrains.kotlin.fir.FirModuleData
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.ThreadSafeMutableState
import org.jetbrains.kotlin.fir.caches.firCachesFactory
import org.jetbrains.kotlin.fir.caches.*
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
import org.jetbrains.kotlin.fir.deserialization.FirBuiltinAnnotationDeserializer
import org.jetbrains.kotlin.fir.deserialization.FirConstDeserializer
@@ -150,7 +150,7 @@ open class FirBuiltinSymbolProvider(
).memberDeserializer
}
private val lookup = moduleData.session.firCachesFactory.createCacheWithPostCompute(
private val classCache = moduleData.session.firCachesFactory.createCacheWithPostCompute(
{ classId: ClassId, context: FirDeserializationContext? -> FirRegularClassSymbol(classId) to context }
) { classId, symbol, parentContext ->
val classData = classDataFinder.findClassData(classId)!!
@@ -165,6 +165,17 @@ open class FirBuiltinSymbolProvider(
)
}
private val functionCache: FirCache<Name, List<FirNamedFunctionSymbol>, Nothing?> =
moduleData.session.firCachesFactory.createCache { name ->
packageProto.`package`.functionList.filter { nameResolver.getName(it.name) == name }.map {
memberDeserializer.loadFunction(it).symbol
}
}
private val functionsNameCache: FirLazyValue<List<Name>> = moduleData.session.firCachesFactory.createLazyValue {
packageProto.`package`.functionList.map { nameResolver.getName(it.name) }
}
fun getClassLikeSymbolByClassId(classId: ClassId): FirRegularClassSymbol? =
findAndDeserializeClass(classId)
@@ -174,20 +185,19 @@ open class FirBuiltinSymbolProvider(
): FirRegularClassSymbol? {
val classIdExists = classId in classDataFinder.allClassIds
if (!classIdExists) return null
return lookup.getValue(classId, parentContext)
return classCache.getValue(classId, parentContext)
}
fun getTopLevelCallableSymbols(name: Name): List<FirCallableSymbol<*>> {
return getTopLevelFunctionSymbols(name)
}
fun getTopLevelCallableNames(): Collection<Name> =
packageProto.`package`.functionList.map { nameResolver.getName(it.name) }
fun getTopLevelCallableNames(): Collection<Name> {
return functionsNameCache.getValue()
}
fun getTopLevelFunctionSymbols(name: Name): List<FirNamedFunctionSymbol> {
return packageProto.`package`.functionList.filter { nameResolver.getName(it.name) == name }.map {
memberDeserializer.loadFunction(it).symbol
}
return functionCache.getValue(name)
}
}
}