diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java index 8594d700bee..47d9bc0257b 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java @@ -34159,6 +34159,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java index 5854ed94a6d..5a82fbe81c4 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java @@ -34159,6 +34159,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/AbstractConeCallConflictResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/AbstractConeCallConflictResolver.kt index fa85c141a12..23bd9e5f647 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/AbstractConeCallConflictResolver.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/AbstractConeCallConflictResolver.kt @@ -61,9 +61,6 @@ abstract class AbstractConeCallConflictResolver( if (isGeneric1 && isGeneric2) return false } - if (!call1.isExpect && call2.isExpect) return true - if (call1.isExpect && !call2.isExpect) return false - if (call1.contextReceiverCount > call2.contextReceiverCount) return true if (call1.contextReceiverCount < call2.contextReceiverCount) return false diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConeOverloadConflictResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConeOverloadConflictResolver.kt index 21400603499..a09264eea6a 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConeOverloadConflictResolver.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConeOverloadConflictResolver.kt @@ -8,6 +8,9 @@ package org.jetbrains.kotlin.fir.resolve.calls import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration +import org.jetbrains.kotlin.fir.declarations.getSingleExpectForActualOrNull +import org.jetbrains.kotlin.fir.declarations.utils.isActual +import org.jetbrains.kotlin.fir.declarations.utils.isExpect import org.jetbrains.kotlin.fir.declarations.utils.modality import org.jetbrains.kotlin.fir.resolve.BodyResolveComponents import org.jetbrains.kotlin.fir.resolve.inference.ConeTypeParameterBasedTypeVariable @@ -31,6 +34,7 @@ import org.jetbrains.kotlin.types.model.KotlinTypeMarker import org.jetbrains.kotlin.types.model.TypeParameterMarker import org.jetbrains.kotlin.types.model.TypeSubstitutorMarker import org.jetbrains.kotlin.types.model.TypeSystemInferenceExtensionContext +import org.jetbrains.kotlin.utils.addToStdlib.runIf import org.jetbrains.kotlin.utils.exceptions.errorWithAttachment typealias CandidateSignature = FlatSignature @@ -266,7 +270,9 @@ class ConeOverloadConflictResolver( ): Candidate? { if (candidates.size <= 1) return candidates.singleOrNull() - val candidateSignatures = candidates.map { candidateCall -> + val candidatesWithoutActualizedExpects = filterOutActualizedExpectCandidates(candidates) + + val candidateSignatures = candidatesWithoutActualizedExpects.map { candidateCall -> createFlatSignature(candidateCall) } @@ -279,6 +285,23 @@ class ConeOverloadConflictResolver( return bestCandidatesByParameterTypes.exactMaxWith()?.origin } + private fun filterOutActualizedExpectCandidates(candidates: Set): Set { + val expectForActualSymbols = candidates + .mapNotNullTo(mutableSetOf()) { + val callableSymbol = it.symbol as? FirCallableSymbol<*> ?: return@mapNotNullTo null + runIf(callableSymbol.isActual) { callableSymbol.getSingleExpectForActualOrNull() } + } + + return if (expectForActualSymbols.isEmpty()) { + candidates // Optimization: in most cases, there are no expectForActualSymbols that's why filtering and allocation are not performed + } else { + candidates.filterTo(mutableSetOf()) { candidate -> + val symbol = candidate.symbol + symbol is FirCallableSymbol<*> && (!symbol.isExpect || symbol !in expectForActualSymbols) + } + } + } + /** * `call1` is not less specific than `call2` */ diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt new file mode 100644 index 00000000000..7ce380aeeb7 --- /dev/null +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt @@ -0,0 +1,26 @@ +// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM +// !LANGUAGE: +MultiPlatformProjects +// ISSUE: KT-58896 + +// MODULE: common +// TARGET_PLATFORM: Common +// FILE: common.kt + +expect fun f(param: Int): String + +fun f(param: Any) = "$param: Any" + +fun commonFun() = "${f(1)}; ${f("s")}" + +// MODULE: platform()()(common) +// FILE: platform.kt + +actual fun f(param: Int) = "$param: Int" + +fun platformFun() = "${f(1)}; ${f("s")}" + +fun box(): String { + if (commonFun() != "1: Int; s: Any") return "FAIL 1" + if (platformFun() != "1: Int; s: Any") return "FAIL 2" + return "OK" +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index fecd6d4777b..53cdcd5ef5a 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -32491,6 +32491,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index 74bb270d3e8..d8da6da9821 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -34159,6 +34159,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java index f92ee0ddf29..7026b86cedb 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java @@ -34159,6 +34159,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index d3e8a988e68..1e6c587e243 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -29136,6 +29136,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt"); } + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt"); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java index 1eb344afebe..d03142b1987 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java @@ -23935,6 +23935,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java index 8f44f9fa348..f73cd045c0b 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java @@ -23935,6 +23935,12 @@ public class FirJsES6CodegenBoxTestGenerated extends AbstractFirJsES6CodegenBoxT runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java index b05302c810d..694d7d5fa01 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java @@ -23935,6 +23935,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java index a3919bb2c18..3cc11d65027 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java @@ -23935,6 +23935,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java index e06eaa3d513..4b8252caa61 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java @@ -26916,6 +26916,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java index 464c2af88af..5ad380bfdb7 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java @@ -27536,6 +27536,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java index cbcb2839376..2a260a24e24 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java @@ -26607,6 +26607,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java index 9216375f6de..0da02ea7c46 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java @@ -26917,6 +26917,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java index 9329f6e0b34..10027c1076f 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java @@ -23689,6 +23689,12 @@ public class FirWasmCodegenBoxTestGenerated extends AbstractFirWasmCodegenBoxTes runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception { diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java index 6a8d8f7dab1..52e6532acd6 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java @@ -23689,6 +23689,12 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); } + @Test + @TestMetadata("expectAndCommonFunctionOverloads.kt") + public void testExpectAndCommonFunctionOverloads() throws Exception { + runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); + } + @Test @TestMetadata("expectInterfaceInSupertypes.kt") public void testExpectInterfaceInSupertypes() throws Exception {