From 6f9078b7961b87ca70e31d6a95e5da84e17fb698 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Mon, 16 Nov 2020 06:50:52 +0100 Subject: [PATCH] [command line] adopt 5de7a10df0e9dafdb03621a96b7e644471b0c0f6 Eliminated -Xdeserialize-fake-overrides --- .../src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt | 3 --- .../kotlin/backend/konan/serialization/KonanIrlinker.kt | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt index 0a158b1a33f..6f07c2e4a1a 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt @@ -72,8 +72,6 @@ internal fun Context.psiToIr( val irProviderForCEnumsAndCStructs = IrProviderForCEnumAndCStructStubs(generatorContext, interopBuiltIns, symbols) - val deserializeFakeOverrides = config.configuration.getBoolean(CommonConfigurationKeys.DESERIALIZE_FAKE_OVERRIDES) - val translationContext = object : TranslationPluginContext { override val moduleDescriptor: ModuleDescriptor get() = generatorContext.moduleDescriptor @@ -98,7 +96,6 @@ internal fun Context.psiToIr( stubGenerator, irProviderForCEnumsAndCStructs, exportedDependencies, - deserializeFakeOverrides, config.cachedLibraries ).also { linker -> 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 2c6676b3da1..69a282cf6a1 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 @@ -78,9 +78,8 @@ internal class KonanIrLinker( private val stubGenerator: DeclarationStubGenerator, private val cenumsProvider: IrProviderForCEnumAndCStructStubs, exportedDependencies: List, - deserializeFakeOverrides: Boolean, private val cachedLibraries: CachedLibraries -) : KotlinIrLinker(currentModule, logger, builtIns, symbolTable, exportedDependencies, deserializeFakeOverrides) { +) : KotlinIrLinker(currentModule, logger, builtIns, symbolTable, exportedDependencies) { companion object { private val C_NAMES_NAME = Name.identifier("cnames")