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

Slightly simplify const deserialization logic in ClassDeserialization

Browse Source
This commit is contained in:
Ivan Kylchik
2023-03-13 11:34:17 +01:00
committed by Space Team
parent 1eabb55641
commit 23b23d5a1e
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
+3 -6
View File
@@ -92,12 +92,9 @@ fun deserializeClassToSymbol(
containerSource, containerSource,
outerClassSymbol = symbol, outerClassSymbol = symbol,
annotationDeserializer, annotationDeserializer,
if (status.isCompanion) { when {
parentContext.constDeserializer status.isCompanion || jvmBinaryClass == null -> parentContext.constDeserializer
} else { else -> constDeserializer // jvmBinaryClass != null => FirJvmConstDeserializer will be used
((containerSource as? KotlinJvmBinarySourceElement)?.binaryClass)?.let {
FirJvmConstDeserializer(session, it, serializerExtensionProtocol)
} ?: parentContext.constDeserializer
}, },
status.isInner status.isInner
) ?: FirDeserializationContext.createForClass( ) ?: FirDeserializationContext.createForClass(