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

Revert "[K/N] deserialize inline functions for header klibs"

Browse Source 
This reverts commit a481f35450.
This commit is contained in:
Dmitriy Dolovov
2024-03-15 17:31:44 +01:00
parent dc66a53611
commit de3ad3cd3a
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt
+1 -4
View File
@@ -32,7 +32,6 @@ import org.jetbrains.kotlin.ir.objcinterop.IrObjCOverridabilityCondition
import org.jetbrains.kotlin.ir.symbols.IrSymbol import org.jetbrains.kotlin.ir.symbols.IrSymbol
import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.ir.visitors.acceptVoid import org.jetbrains.kotlin.ir.visitors.acceptVoid
import org.jetbrains.kotlin.library.isHeader
import org.jetbrains.kotlin.library.metadata.DeserializedKlibModuleOrigin import org.jetbrains.kotlin.library.metadata.DeserializedKlibModuleOrigin
import org.jetbrains.kotlin.library.metadata.KlibModuleOrigin import org.jetbrains.kotlin.library.metadata.KlibModuleOrigin
import org.jetbrains.kotlin.library.metadata.isFromInteropLibrary import org.jetbrains.kotlin.library.metadata.isFromInteropLibrary
@@ -181,9 +180,7 @@ internal fun PsiToIrContext.psiToIr(
val kotlinLibrary = (dependency.getCapability(KlibModuleOrigin.CAPABILITY) as? DeserializedKlibModuleOrigin)?.library val kotlinLibrary = (dependency.getCapability(KlibModuleOrigin.CAPABILITY) as? DeserializedKlibModuleOrigin)?.library
val isFullyCachedLibrary = kotlinLibrary != null && val isFullyCachedLibrary = kotlinLibrary != null &&
config.cachedLibraries.isLibraryCached(kotlinLibrary) && kotlinLibrary != config.libraryToCache?.klib config.cachedLibraries.isLibraryCached(kotlinLibrary) && kotlinLibrary != config.libraryToCache?.klib
if (isFullyCachedLibrary && kotlinLibrary?.isHeader == true) if (isProducingLibrary || isFullyCachedLibrary)
linker.deserializeHeadersWithInlineBodies(dependency, kotlinLibrary)
else if (isProducingLibrary || isFullyCachedLibrary)
linker.deserializeOnlyHeaderModule(dependency, kotlinLibrary) linker.deserializeOnlyHeaderModule(dependency, kotlinLibrary)
else else
linker.deserializeIrModuleHeader(dependency, kotlinLibrary, dependency.name.asString()) linker.deserializeIrModuleHeader(dependency, kotlinLibrary, dependency.name.asString())
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt
+2 -2
View File
@@ -38,8 +38,7 @@ internal class NativeInlineFunctionResolver(override val context: Context, val g
val packageFragment = function.getPackageFragment() val packageFragment = function.getPackageFragment()
val moduleDeserializer = context.irLinker.getCachedDeclarationModuleDeserializer(function) val moduleDeserializer = context.irLinker.getCachedDeclarationModuleDeserializer(function)
val irFile: IrFile val irFile: IrFile
val functionIsCached = moduleDeserializer != null && function.body == null val (possiblyLoweredFunction, shouldLower) = if (moduleDeserializer != null) {
val (possiblyLoweredFunction, shouldLower) = if (functionIsCached) {
// The function is cached, get its body from the IR linker. // The function is cached, get its body from the IR linker.
val (firstAccess, deserializedInlineFunction) = moduleDeserializer.deserializeInlineFunction(function) val (firstAccess, deserializedInlineFunction) = moduleDeserializer.deserializeInlineFunction(function)
generationState.inlineFunctionOrigins[function] = deserializedInlineFunction generationState.inlineFunctionOrigins[function] = deserializedInlineFunction
@@ -58,6 +57,7 @@ internal class NativeInlineFunctionResolver(override val context: Context, val g
} }
if (shouldLower) { if (shouldLower) {
val functionIsCached = moduleDeserializer != null
lower(possiblyLoweredFunction, irFile, functionIsCached) lower(possiblyLoweredFunction, irFile, functionIsCached)
if (!functionIsCached) { if (!functionIsCached) {
generationState.inlineFunctionOrigins[function] = generationState.inlineFunctionOrigins[function] =