From 6877b2fc55535c5b56ff90a31489306aba6110dd Mon Sep 17 00:00:00 2001
From: Svyatoslav Scherbina <svyatoslav.scherbina@jetbrains.com>
Date: Tue, 10 Jan 2023 17:38:26 +0100
Subject: [PATCH] K2: add KlibDeserializedContainerSource to packages too

^KT-55809
---
 .../fir/session/KlibBasedSymbolProvider.kt      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/KlibBasedSymbolProvider.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/KlibBasedSymbolProvider.kt
index d1009089489..e516acf556c 100644
--- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/KlibBasedSymbolProvider.kt
+++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/KlibBasedSymbolProvider.kt
@@ -87,7 +87,7 @@ class KlibBasedSymbolProvider(
                         packageFqName, packageProto, nameResolver, moduleData,
                         annotationDeserializer,
                         constDeserializer,
-                        null,
+                        createDeserializedContainerSource(resolvedLibrary, packageFqName),
                     ),
                 )
             }
@@ -116,11 +116,7 @@ class KlibBasedSymbolProvider(
                 val moduleData = moduleDataProvider.getModuleData(libraryPath) ?: return null
 
                 return ClassMetadataFindResult.NoMetadata { symbol ->
-                    val source = KlibDeserializedContainerSource(
-                        moduleHeaders[resolvedLibrary]!!,
-                        deserializationConfiguration,
-                        classId.packageFqName
-                    )
+                    val source = createDeserializedContainerSource(resolvedLibrary, classId.packageFqName)
 
                     deserializeClassToSymbol(
                         classId,
@@ -145,6 +141,15 @@ class KlibBasedSymbolProvider(
         return null
     }
 
+    private fun createDeserializedContainerSource(
+        resolvedLibrary: KotlinResolvedLibrary,
+        packageFqName: FqName
+    ) = KlibDeserializedContainerSource(
+        moduleHeaders[resolvedLibrary]!!,
+        deserializationConfiguration,
+        packageFqName
+    )
+
     override fun isNewPlaceForBodyGeneration(classProto: ProtoBuf.Class) = false
 
     override fun getPackage(fqName: FqName): FqName? {