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

FIR: use FirCachesFactory for package type alias in KotlinDeserializedJvmSymbolsProvider

Browse Source
This commit is contained in:
Ilya Kirillov
2021-01-19 19:11:56 +01:00
parent b270d66f68
commit 32ae395e05
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt
+12 -10
View File
@@ -50,7 +50,7 @@ class KotlinDeserializedJvmSymbolsProvider(
private val kotlinScopeProvider: KotlinScopeProvider, private val kotlinScopeProvider: KotlinScopeProvider,
) : FirSymbolProvider(session) { ) : FirSymbolProvider(session) {
private val annotationsLoader = AnnotationsLoader(session) private val annotationsLoader = AnnotationsLoader(session)
private val typeAliasCache = SymbolProviderCache<ClassId, FirTypeAliasSymbol>() private val typeAliasCache = session.firCachesFactory.createCache(::findAndDeserializeTypeAlias)
private val packagePartsCache = SymbolProviderCache<FqName, Collection<PackagePartsCacheData>>() private val packagePartsCache = SymbolProviderCache<FqName, Collection<PackagePartsCacheData>>()
private val classCache = private val classCache =
@@ -131,20 +131,22 @@ class KotlinDeserializedJvmSymbolsProvider(
get() = classHeader.isPreRelease get() = classHeader.isPreRelease
override fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? { override fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? {
return getClass(classId) ?: findAndDeserializeTypeAlias(classId) return getClass(classId) ?: getTypeAlias(classId)
} }
private fun findAndDeserializeTypeAlias( private fun getTypeAlias(
classId: ClassId, classId: ClassId,
): FirTypeAliasSymbol? { ): FirTypeAliasSymbol? {
if (!classId.relativeClassName.isOneSegmentFQN()) return null if (!classId.relativeClassName.isOneSegmentFQN()) return null
return typeAliasCache.lookupCacheOrCalculate(classId) { return typeAliasCache.getValue(classId)
getPackageParts(classId.packageFqName).firstNotNullResult { part -> }
val ids = part.typeAliasNameIndex[classId.shortClassName]
if (ids == null || ids.isEmpty()) return@firstNotNullResult null private fun findAndDeserializeTypeAlias(classId: ClassId): FirTypeAliasSymbol? {
val aliasProto = ids.map { part.proto.getTypeAlias(it) }.single() return getPackageParts(classId.packageFqName).firstNotNullResult { part ->
part.context.memberDeserializer.loadTypeAlias(aliasProto).symbol val ids = part.typeAliasNameIndex[classId.shortClassName]
} if (ids == null || ids.isEmpty()) return@firstNotNullResult null
val aliasProto = ids.map { part.proto.getTypeAlias(it) }.single()
part.context.memberDeserializer.loadTypeAlias(aliasProto).symbol
} }
} }