[Native] Init KonanPartialModuleDeserializer with NativeCacheSupport
^KT-73705 Fixed
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrLinker.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrLinker.kt
index 3b18c535..9725655 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrLinker.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrLinker.kt
@@ -97,7 +97,7 @@
else -> {
val deserializationStrategy = nativeCacheSupport.getDeserializationStrategy(klib)
KonanPartialModuleDeserializer(
- this, moduleDescriptor, klib, stubGenerator, nativeCacheSupport.cachedLibraries, inlineFunctionFiles, strategyResolver, deserializationStrategy
+ this, moduleDescriptor, klib, stubGenerator, nativeCacheSupport, inlineFunctionFiles, strategyResolver, deserializationStrategy
).also {
moduleDeserializers[moduleDescriptor] = it
klibToModuleDeserializerMap[klib] = it
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanPartialModuleDeserializer.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanPartialModuleDeserializer.kt
index 9c5da4e..088c868 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanPartialModuleDeserializer.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanPartialModuleDeserializer.kt
@@ -39,7 +39,7 @@
moduleDescriptor: ModuleDescriptor,
override val klib: KotlinLibrary,
private val stubGenerator: DeclarationStubGenerator,
- private val cachedLibraries: CachedLibrariesBase,
+ private val nativeCacheSupport: NativeCacheSupport,
private val inlineFunctionFiles: MutableMap<IrExternalPackageFragment, IrFile>,
strategyResolver: (String) -> DeserializationStrategy,
private val cacheDeserializationStrategy: CacheDeserializationStrategyBase,
@@ -307,7 +307,7 @@
}
private val inlineFunctionReferences by lazy {
- cachedLibraries.inlineFunctionReferences(klib) {
+ nativeCacheSupport.cachedLibraries.inlineFunctionReferences(klib) {
it.file.deserializationState.declarationDeserializer.symbolDeserializer.deserializeIdSignature(it.functionSignature)
}
}
@@ -400,7 +400,7 @@
}
private val classesFields by lazy {
- cachedLibraries.classesFields(klib)
+ nativeCacheSupport.cachedLibraries.classesFields(klib)
}
private val lock = Any()
@@ -484,7 +484,7 @@
}
val eagerInitializedFiles by lazy {
- cachedLibraries.eagerInitializedFiles(klib) {
+ nativeCacheSupport.cachedLibraries.eagerInitializedFiles(klib) {
it.file.deserializationState.file
}
}
