[IR] Fix bug: IR didn't match private expect constructor with appropriate actual
^KT-68798 Fixed
Review: https://jetbrains.team/p/kt/reviews/16358/timeline
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java
index 2f883b4..340ca89 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java
@@ -38960,6 +38960,12 @@
}
@Test
+ @TestMetadata("privateConstructorWithDefaults.kt")
+ public void testPrivateConstructorWithDefaults() {
+ runTest("compiler/testData/codegen/box/multiplatform/k2/privateConstructorWithDefaults.kt");
+ }
+
+ @Test
@TestMetadata("staticjavaFieldInCommonCode.kt")
public void testStaticjavaFieldInCommonCode() {
runTest("compiler/testData/codegen/box/multiplatform/k2/staticjavaFieldInCommonCode.kt");
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java
index 4c1e0f2..70dbf71 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java
@@ -38960,6 +38960,12 @@
}
@Test
+ @TestMetadata("privateConstructorWithDefaults.kt")
+ public void testPrivateConstructorWithDefaults() {
+ runTest("compiler/testData/codegen/box/multiplatform/k2/privateConstructorWithDefaults.kt");
+ }
+
+ @Test
@TestMetadata("staticjavaFieldInCommonCode.kt")
public void testStaticjavaFieldInCommonCode() {
runTest("compiler/testData/codegen/box/multiplatform/k2/staticjavaFieldInCommonCode.kt");
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 cf15db2..7d45ea8 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
@@ -38793,6 +38793,12 @@
}
@Test
+ @TestMetadata("privateConstructorWithDefaults.kt")
+ public void testPrivateConstructorWithDefaults() {
+ runTest("compiler/testData/codegen/box/multiplatform/k2/privateConstructorWithDefaults.kt");
+ }
+
+ @Test
@TestMetadata("staticjavaFieldInCommonCode.kt")
public void testStaticjavaFieldInCommonCode() {
runTest("compiler/testData/codegen/box/multiplatform/k2/staticjavaFieldInCommonCode.kt");
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 2fbf6b7..884060f 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
@@ -38793,6 +38793,12 @@
}
@Test
+ @TestMetadata("privateConstructorWithDefaults.kt")
+ public void testPrivateConstructorWithDefaults() {
+ runTest("compiler/testData/codegen/box/multiplatform/k2/privateConstructorWithDefaults.kt");
+ }
+
+ @Test
@TestMetadata("staticjavaFieldInCommonCode.kt")
public void testStaticjavaFieldInCommonCode() {
runTest("compiler/testData/codegen/box/multiplatform/k2/staticjavaFieldInCommonCode.kt");
diff --git a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualChecker.kt b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualChecker.kt
index d6a7a11..40b8d5e 100644
--- a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualChecker.kt
+++ b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualChecker.kt
@@ -183,7 +183,8 @@
val actualMembersByName = actualClassSymbol.collectAllMembers(isActualDeclaration = true).groupBy { nameOf(it) }
val expectMembers = expectClassSymbol.collectAllMembers(isActualDeclaration = false)
- .filterNot { it is CallableSymbolMarker && it.visibility == Visibilities.Private }
+ // private expect constructors are yet allowed KT-68688
+ .filterNot { it is CallableSymbolMarker && it !is ConstructorSymbolMarker && it.visibility == Visibilities.Private }
for (expectMember in expectMembers) {
val actualMembers = getPossibleActualsByExpectName(expectMember, actualMembersByName)
diff --git a/compiler/testData/codegen/box/multiplatform/k2/privateConstructorWithDefaults.kt b/compiler/testData/codegen/box/multiplatform/k2/privateConstructorWithDefaults.kt
new file mode 100644
index 0000000..402bda1
--- /dev/null
+++ b/compiler/testData/codegen/box/multiplatform/k2/privateConstructorWithDefaults.kt
@@ -0,0 +1,16 @@
+// IGNORE_BACKEND: WASM
+// LANGUAGE: +MultiPlatformProjects
+// ISSUE: KT-68798
+
+// MODULE: common
+// FILE: common.kt
+
+expect open class Frame private constructor(disposableHandle: CharSequence = "OK")
+
+// MODULE: platform()()(common)
+// FILE: platform.kt
+actual open class Frame actual constructor(val disposableHandle: CharSequence) {
+ class Break : Frame()
+}
+
+fun box() = Frame.Break().disposableHandle
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 c9b25d4..be8193e 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
@@ -27842,6 +27842,12 @@
runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt");
}
+ @Test
+ @TestMetadata("privateConstructorWithDefaults.kt")
+ public void testPrivateConstructorWithDefaults() {
+ runTest("compiler/testData/codegen/box/multiplatform/k2/privateConstructorWithDefaults.kt");
+ }
+
@Nested
@TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations")
@TestDataPath("$PROJECT_ROOT")
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 d77c46c..ba4ebe8 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
@@ -27842,6 +27842,12 @@
runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt");
}
+ @Test
+ @TestMetadata("privateConstructorWithDefaults.kt")
+ public void testPrivateConstructorWithDefaults() {
+ runTest("compiler/testData/codegen/box/multiplatform/k2/privateConstructorWithDefaults.kt");
+ }
+
@Nested
@TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations")
@TestDataPath("$PROJECT_ROOT")
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java
index 716d728..7f8c91b 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java
@@ -30870,6 +30870,12 @@
runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt");
}
+ @Test
+ @TestMetadata("privateConstructorWithDefaults.kt")
+ public void testPrivateConstructorWithDefaults() {
+ runTest("compiler/testData/codegen/box/multiplatform/k2/privateConstructorWithDefaults.kt");
+ }
+
@Nested
@TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations")
@TestDataPath("$PROJECT_ROOT")
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java
index f72d121..b5c7ab7 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java
@@ -31556,6 +31556,12 @@
runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt");
}
+ @Test
+ @TestMetadata("privateConstructorWithDefaults.kt")
+ public void testPrivateConstructorWithDefaults() {
+ runTest("compiler/testData/codegen/box/multiplatform/k2/privateConstructorWithDefaults.kt");
+ }
+
@Nested
@TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations")
@TestDataPath("$PROJECT_ROOT")
diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java
index 6bf6a6d..4e823be 100644
--- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java
+++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java
@@ -27806,6 +27806,12 @@
runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt");
}
+ @Test
+ @TestMetadata("privateConstructorWithDefaults.kt")
+ public void testPrivateConstructorWithDefaults() {
+ runTest("compiler/testData/codegen/box/multiplatform/k2/privateConstructorWithDefaults.kt");
+ }
+
@Nested
@TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations")
@TestDataPath("$PROJECT_ROOT")
