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

[FIR] Enhance caches in providers

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-06-14 19:50:21 +03:00
committed by Mikhail Glukhikh
parent f88fafea9d
commit 03c3469a14
2 changed files with 10 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
+5 -5
View File
@@ -55,6 +55,7 @@ import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData
import org.jetbrains.kotlin.serialization.deserialization.getName import org.jetbrains.kotlin.serialization.deserialization.getName
import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
import org.jetbrains.kotlin.utils.getOrPutNullable
class KotlinDeserializedJvmSymbolsProvider( class KotlinDeserializedJvmSymbolsProvider(
val session: FirSession, val session: FirSession,
@@ -63,10 +64,9 @@ class KotlinDeserializedJvmSymbolsProvider(
private val kotlinClassFinder: KotlinClassFinder, private val kotlinClassFinder: KotlinClassFinder,
private val javaClassFinder: JavaClassFinder private val javaClassFinder: JavaClassFinder
) : AbstractFirSymbolProvider() { ) : AbstractFirSymbolProvider() {
private val classesCache = HashMap<ClassId, FirClassSymbol>()
private val classesCache = mutableMapOf<ClassId, FirClassSymbol>() private val typeAliasCache = HashMap<ClassId, FirTypeAliasSymbol?>()
private val typeAliasCache = mutableMapOf<ClassId, FirTypeAliasSymbol?>() private val packagePartsCache = HashMap<FqName, Collection<PackagePartsCacheData>>()
private val packagePartsCache = mutableMapOf<FqName, Collection<PackagePartsCacheData>>()
private class PackagePartsCacheData( private class PackagePartsCacheData(
val proto: ProtoBuf.Package, val proto: ProtoBuf.Package,
@@ -156,7 +156,7 @@ class KotlinDeserializedJvmSymbolsProvider(
private fun findAndDeserializeTypeAlias( private fun findAndDeserializeTypeAlias(
classId: ClassId classId: ClassId
): FirTypeAliasSymbol? { ): FirTypeAliasSymbol? {
return typeAliasCache.getOrPut(classId) { return typeAliasCache.getOrPutNullable(classId) {
getPackageParts(classId.packageFqName).firstNotNullResult { part -> getPackageParts(classId.packageFqName).firstNotNullResult { part ->
val ids = part.typeAliasNameIndex[classId.shortClassName] val ids = part.typeAliasNameIndex[classId.shortClassName]
if (ids == null || ids.isEmpty()) return@firstNotNullResult null if (ids == null || ids.isEmpty()) return@firstNotNullResult null
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/AbstractFirSymbolProvider.kt
+5 -5
View File
@@ -15,12 +15,12 @@ import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
abstract class AbstractFirSymbolProvider : FirSymbolProvider() { abstract class AbstractFirSymbolProvider : FirSymbolProvider() {
protected val classCache = mutableMapOf<ClassId, ConeClassLikeSymbol?>() protected val classCache = HashMap<ClassId, ConeClassLikeSymbol?>()
protected val topLevelCallableCache = mutableMapOf<CallableId, List<ConeCallableSymbol>>() protected val topLevelCallableCache = HashMap<CallableId, List<ConeCallableSymbol>>()
protected val packageCache = mutableMapOf<FqName, FqName?>() protected val packageCache = HashMap<FqName, FqName?>()
protected inline fun <K, V : Any?> MutableMap<K, V>.lookupCacheOrCalculate(key: K, crossinline l: (K) -> V): V? { protected inline fun <K, V : Any?> MutableMap<K, V>.lookupCacheOrCalculate(key: K, crossinline l: (K) -> V): V? {
return if (key in this.keys) { return if (containsKey(key)) {
this[key] this[key]
} else { } else {
val calculated = l(key) val calculated = l(key)
@@ -32,7 +32,7 @@ abstract class AbstractFirSymbolProvider : FirSymbolProvider() {
protected inline fun <K, V : Any?, T> MutableMap<K, V>.lookupCacheOrCalculateWithPostCompute( protected inline fun <K, V : Any?, T> MutableMap<K, V>.lookupCacheOrCalculateWithPostCompute(
key: K, crossinline l: (K) -> Pair<V, T>, postCompute: (V, T) -> Unit key: K, crossinline l: (K) -> Pair<V, T>, postCompute: (V, T) -> Unit
): V? { ): V? {
return if (key in this.keys) { return if (containsKey(key)) {
this[key] this[key]
} else { } else {
val calculated = l(key) val calculated = l(key)