From 760c33bd430778cfc6b8f5a5fe9cc2c63dc74068 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Tue, 21 Dec 2021 16:05:04 +0100 Subject: [PATCH] [MPP] Fixup ExpectDeclarationsRemoving after changes to ExpectActualResolver ^KT-50120 --- .../kotlin/backend/konan/lower/ExpectDeclarationsRemoving.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 8a3816b08e7..ccc26fbccd5 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 @@ -27,6 +27,7 @@ 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 /** * This pass removes all declarations with `isExpect == true`. @@ -107,7 +108,7 @@ internal class ExpectToActualDefaultValueCopier(private val irModule: IrModuleFr if (!descriptor.isExpect) error(this) - findCompatibleActualForExpected(descriptor.module).singleOrNull() ?: error(descriptor) + findCompatibleActualsForExpected(descriptor.module).singleOrNull() ?: error(descriptor) } as T private fun IrExpression.remapExpectValueSymbols(): IrExpression {