Slightly simplify const deserialization logic in ClassDeserialization

2023-03-13 11:34:17 +01:00
parent 1eabb55641
commit 23b23d5a1e
1 changed files with 3 additions and 6 deletions
@@ -92,12 +92,9 @@ fun deserializeClassToSymbol(
            containerSource,
            outerClassSymbol = symbol,
            annotationDeserializer,
-            if (status.isCompanion) {
-                parentContext.constDeserializer
-            } else {
-                ((containerSource as? KotlinJvmBinarySourceElement)?.binaryClass)?.let {
-                    FirJvmConstDeserializer(session, it, serializerExtensionProtocol)
-                } ?: parentContext.constDeserializer
+            when {
+                status.isCompanion || jvmBinaryClass == null -> parentContext.constDeserializer
+                else -> constDeserializer // jvmBinaryClass != null => FirJvmConstDeserializer will be used
            },
            status.isInner
        ) ?: FirDeserializationContext.createForClass(