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

FIR: optimize caching in JVM deserializer

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-04-10 21:21:51 +03:00
committed by Mikhail Glukhikh
parent f453e7df27
commit 879563233a
1 changed files with 9 additions and 6 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
+9 -6
View File
@@ -65,18 +65,21 @@ class KotlinDeserializedJvmSymbolsProvider(
classId: ClassId, classId: ClassId,
parentContext: FirDeserializationContext? = null parentContext: FirDeserializationContext? = null
): FirClassSymbol? { ): FirClassSymbol? {
val kotlinJvmBinaryClass = kotlinClassFinder.findKotlinClass(classId) ?: return null return classesCache.getOrPut(classId) {
if (kotlinJvmBinaryClass.classHeader.kind != KotlinClassHeader.Kind.CLASS) return null //return null
val kotlinJvmBinaryClass = kotlinClassFinder.findKotlinClass(classId) ?: return null
if (kotlinJvmBinaryClass.classHeader.kind != KotlinClassHeader.Kind.CLASS) return null
val data = kotlinJvmBinaryClass.classHeader.data ?: return null val data = kotlinJvmBinaryClass.classHeader.data ?: return null
val strings = kotlinJvmBinaryClass.classHeader.strings ?: return null val strings = kotlinJvmBinaryClass.classHeader.strings ?: return null
val (nameResolver, classProto) = JvmProtoBufUtil.readClassDataFrom(data, strings) val (nameResolver, classProto) = JvmProtoBufUtil.readClassDataFrom(data, strings)
return classesCache.getOrPut(classId, { FirClassSymbol(classId) }) { symbol -> val symbol = FirClassSymbol(classId)
deserializeClassToSymbol( deserializeClassToSymbol(
classId, classProto, symbol, nameResolver, session, parentContext, classId, classProto, symbol, nameResolver, session, parentContext,
this::findAndDeserializeClass this::findAndDeserializeClass
) )
symbol
} }
} }