From b6b5ecc352f389e660e8978da413c27095d7f0a2 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Tue, 21 Dec 2021 16:27:37 +0100 Subject: [PATCH] [MPP] Remove unnecessary ExpectActualResolver receiver ^KT-50120 --- .../konan/lower/ExpectDeclarationsRemoving.kt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ExpectDeclarationsRemoving.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ExpectDeclarationsRemoving.kt index ccc26fbccd5..fd2dda03737 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ExpectDeclarationsRemoving.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ExpectDeclarationsRemoving.kt @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.backend.konan.Context import org.jetbrains.kotlin.backend.konan.descriptors.isExpectMember import org.jetbrains.kotlin.backend.konan.descriptors.propertyIfAccessor import org.jetbrains.kotlin.backend.konan.ir.ModuleIndex -import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.MemberDescriptor import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.* @@ -25,7 +24,6 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid import org.jetbrains.kotlin.ir.visitors.acceptVoid import org.jetbrains.kotlin.resolve.descriptorUtil.module -import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolver import org.jetbrains.kotlin.resolve.multiplatform.OptionalAnnotationUtil import org.jetbrains.kotlin.resolve.multiplatform.findCompatibleActualsForExpected @@ -103,13 +101,10 @@ internal class ExpectToActualDefaultValueCopier(private val irModule: IrModuleFr private fun IrClass.findActualForExpected(): IrClass = moduleIndex.classes[descriptor.findActualForExpect()]!! - private inline fun T.findActualForExpect() = with(ExpectedActualResolver) { - val descriptor = this@findActualForExpect - - if (!descriptor.isExpect) error(this) - - findCompatibleActualsForExpected(descriptor.module).singleOrNull() ?: error(descriptor) - } as T + private inline fun T.findActualForExpect(): T { + if (!this.isExpect) error(this) + return (findCompatibleActualsForExpected(module).singleOrNull() ?: error(this)) as T + } private fun IrExpression.remapExpectValueSymbols(): IrExpression { class SymbolRemapper : DeepCopySymbolRemapper() {