From 23b23d5a1e945809d9e2c3d743cb06e317b62217 Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Mon, 13 Mar 2023 11:34:17 +0100
Subject: [PATCH] Slightly simplify const deserialization logic in
 `ClassDeserialization`

---
 .../kotlin/fir/deserialization/ClassDeserialization.kt   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
index 88370f36f15..19d54a6e799 100644
--- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
+++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
@@ -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(